ish_manager 0.1.8.257 → 0.1.8.261

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b660106cd844ab90b5803fd365df05e8d61fd3af1814ef776f593361daee27f
-  data.tar.gz: 158d6293c36c5386b67bd080968530588d987e57c9fdf681693cf56b6a44bbd2
+  metadata.gz: 006cc153f6fc7808e3cefb1afd2ecb8c333157a8466ff1602dfe7aeeda3bb1f9
+  data.tar.gz: 61ad4d1e6fb8bf67a89aafd4efa9b404b7dc200751ff645451f809ec5ba7b83e
 SHA512:
-  metadata.gz: e230441cad9274a3ed7487b7fb2d8f7f2195dca79e910bfa85899d2b4f98faace4e82f7d44939e4a4bc744dcb0a50e7390db77b349f3cb72e168cf05e17c7c69
-  data.tar.gz: 4a8f0c327ab53d6fae4d4b14bfedb7db501f7cec920d74aa11cfa7fdffe09860674526930f4e13c33c63744d2452b849d459687600018415a65b65874dd4939b
+  metadata.gz: 561450268ea240743abbbddca49574be06245a5779153da9c88836925d3ff8c65140e4b2a8a10eaf4b3192b0aca834085f30fb36ea0a1387d9d91ddc2342534f
+  data.tar.gz: 4710b5f7bf35185586f158d884e82fd57cf37d5086bf54f67b4d1ed9ad87c77aa639115d0f517129c0a0069133ee6ae8e0d4857d4f1c727ed09ed9c78f39b327

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

@@ -21,7 +21,7 @@
  *= require ish_manager/videos
  */
 
- body {
+body {
   background: #dedede;
   font-size: 20px;
 }
@@ -61,6 +61,14 @@ pre {
   padding: 1em;
 }
 
+.bordered {
+  border: 1px solid grey;
+  padding: .5em;
+  border-radius: 8px;
+  margin-bottom: .5em;
+}
+
+
 /* C */
 
 .center {
@@ -103,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/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/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/stock_watches_controller.rb

@@ -3,7 +3,7 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
 
   def index
     authorize! :index, Ish::StockWatch
-    @profiles = IshModels::UserProfile.all
+    @profiles = Ish::UserProfile.all
     @stock_watches = Ish::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
       ).includes( :profile )
     @stock_watch = Ish::StockWatch.new

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

@@ -87,7 +87,7 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   def edit
     @video = Video.unscoped.find params[:id]
-    @user_profiles_list = IshModels::UserProfile.list
+    @user_profiles_list = Ish::UserProfile.list
     authorize! :edit, @video
 
     @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list

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
 
@@ -66,6 +66,11 @@ class IshManager::Ability
       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,
+         ], Gameui::Map
+
       end
 
 

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,26 @@
 
-.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
-
-      %ul
+        %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/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/galleries'     ? 'active' : '' }
+          = link_to 'Galleries', galleries_path
+          = link_to '[+]', new_gallery_path
+        %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }
+          = link_to 'Reports',   reports_path
+          = link_to '[+]', new_report_path
+        %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }
+          = link_to 'Videos',    videos_path
+          = link_to '[+]', new_video_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,22 @@
+
+
+        -# %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_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_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/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/_main_header_manager.haml

@@ -10,8 +10,9 @@
               %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          
+              %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
           %ul.nav.nav-pills
+            %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

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,21 +13,23 @@
     [<>]
   .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|
-      .item
+    - @markers.each do |marker|
+      .flex-row.bordered
+        = image_tag marker.image.image.url(:original)
         .flat-row
           .a= marker.slug
           .a= button_to '~', edit_marker_path(marker), method: :get
           .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
           .a= link_to '[api]', api_marker_path(marker)
           .a= link_to '[this map]', edit_map_path(marker.slug)
+      .hide
         %ul.bullets
           %li <b>item_type:</b> #{marker.item_type}
 
@@ -40,3 +42,5 @@
       .item
         = link_to m.slug, edit_map_path(m.id)
 
+%hr
+= render 'form'

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

@@ -35,7 +35,7 @@
           = f.label :image
           = file_field_tag :image
           .image-thumb
-            = image_tag(@marker.image.image.url(:thumb)) rescue nil
+            = image_tag(@marker.image.image.url(:original)) rescue nil
             = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{@marker.centerOffsetY-10}px; left: #{@marker.centerOffsetX-10}px;" )
       .col.s3
         .field
@@ -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/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/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,38 +18,6 @@ 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
@@ -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.257
+  version: 0.1.8.261
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,9 +213,6 @@ 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/ally_controller.rb
-- app/controllers/ish_manager/trash/stock_actions_controller.rb
-- app/controllers/ish_manager/trash/stock_options_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/users_controller.rb
 - app/controllers/ish_manager/venues_controller.rb
@@ -229,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

data/app/controllers/ish_manager/trash/ally_controller.rb

@@ -1,8 +0,0 @@
-
-class IshManager::AllyController < IshManager::ApplicationController
-
-  def home
-    authorize! :ally_home, IshManager::Ability
-  end
-
-end

data/app/controllers/ish_manager/trash/stock_actions_controller.rb

@@ -1,60 +0,0 @@
-
-class IshManager::StockActionsController < IshManager::ApplicationController
-
-  PERMITTED_PARAMS = [ :stock_watch, :is_active ]
-
-  def index
-    authorize! :index, Ish::StockAction
-    @profiles      = IshModels::UserProfile.all
-    @stock_watches_list = Ish::StockWatch.all.map { |w| [w.to_s, w.id] }
-    @stock_options_list = Ish::StockOption.all.map { |o| [ o.to_s, o.id] }
-    @stock_actions = Ish::StockAction.all.includes( :profile )
-    @stock_action  = Ish::StockAction.new
-    render 'index', :layout => 'ish_manager/application_no_materialize'
-  end
-
-  def create
-    @stock_action = Ish::StockAction.new params.require(:ish_stock_action).permit( PERMITTED_PARAMS )
-    @stock_action.profile = current_user.profile
-    authorize! :create, @stock_action
-
-    flag = true
-    if params[:ish_stock_action][:stock_options]
-      stock_options = Ish::StockOption.where( :id.in => params[:ish_stock_action][:stock_options] )
-      flag = stock_options.update_all( :stock_action_id => @stock_action.id )
-    end
-    if flag
-      flag = @stock_action.save
-    end
-    if flag
-      flash[:notice] = 'Created stock action.'
-    else
-      flash[:alert] = "Cannot create stock action: #{@stock_action.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-  def update
-    @stock_action = Ish::StockAction.find params[:id]
-    authorize! :update, @stock_action
-
-    flag = true
-    if params[:ish_stock_action][:stock_options]
-      stock_options = Ish::StockOption.where( :id.in => params[:ish_stock_action][:stock_options] )
-      flag = stock_options.update_all( :stock_action_id => @stock_action.id )
-    end
-    if flag
-      flag = @stock_action.update_attributes params.require(:ish_stock_action).permit( PERMITTED_PARAMS )
-    end
-    if flag
-      flash[:notice] = 'Updated stock action.'
-    else
-      flash[:alert] = "Cannot update stock action: #{@stock_action.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-end
-
-
-

data/app/controllers/ish_manager/trash/stock_options_controller.rb

@@ -1,41 +0,0 @@
-
-class IshManager::StockOptionsController < IshManager::ApplicationController
-
-  def index
-    authorize! :index, Ish::StockOption
-    @profiles = IshModels::UserProfile.all
-    @stock_options = Ish::StockOption.all.includes( :profile )
-    @stock_option = Ish::StockOption.new
-    render 'index', :layout => 'ish_manager/application_no_materialize'
-  end
-
-  def create
-    @stock_option = Ish::StockOption.new params[:ish_stock_option].permit!
-    @stock_option.profile = current_user.profile
-    authorize! :create, @stock_option
-    flag = @stock_option.save
-
-    if flag
-      flash[:notice] = 'Created stock option.'
-    else
-      flash[:alert] = "Cannot create stock option: #{@stock_option.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-  def update
-    @stock_option = Ish::StockOption.find params[:id]
-    authorize! :update, @stock_option
-    flag = @stock_option.update_attributes params[:ish_stock_option].permit!
-    if flag
-      flash[:notice] = 'Updated stock option.'
-    else
-      flash[:alert] = "Cannot update stock option: #{@stock_option.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-end
-
-
-