ish_manager 0.1.8.261 → 0.1.8.263

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 006cc153f6fc7808e3cefb1afd2ecb8c333157a8466ff1602dfe7aeeda3bb1f9
-  data.tar.gz: 61ad4d1e6fb8bf67a89aafd4efa9b404b7dc200751ff645451f809ec5ba7b83e
+  metadata.gz: 418646349055afb3072f68d9fc12527add24597969d62ce4ff4aa41eef0d879b
+  data.tar.gz: cc4e03f30e8c12df9227fb6424b33207f847ff12ef2bdf90df41dea1de2748e0
 SHA512:
-  metadata.gz: 561450268ea240743abbbddca49574be06245a5779153da9c88836925d3ff8c65140e4b2a8a10eaf4b3192b0aca834085f30fb36ea0a1387d9d91ddc2342534f
-  data.tar.gz: 4710b5f7bf35185586f158d884e82fd57cf37d5086bf54f67b4d1ed9ad87c77aa639115d0f517129c0a0069133ee6ae8e0d4857d4f1c727ed09ed9c78f39b327
+  metadata.gz: d04670dd256406a4c75dab4a62796dcfde3fb22f38ec65b738ac6f2fe972a33b32b8fcc43f5613861b8e7400a7d3dd92582613eb68a1be59f4acda1494697864
+  data.tar.gz: 104e3b96eef1193d21ba175122c8de72dba98f93e572af83af5654479dfe767860d3f654e669bb2634d0f8e6e9a678fb13381316cd4d568f6b792806b376026c

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 = Ish::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/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 = 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 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/views/ish_manager/application/_main_header_admin.haml

@@ -11,16 +11,28 @@
             = 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/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/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

@@ -8,7 +8,6 @@
         -# %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

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

@@ -21,7 +21,7 @@ namespace :ish_manager do
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.261
+  version: 0.1.8.263
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-15 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