ish_manager 0.1.8.220 → 0.1.8.225

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4876975073e83fd31af4b481785323077b766f5f010b5338337b38b8d6f07502
-  data.tar.gz: 55bd3e1bba4f45626fcd96f7d28c3e127198d501c60f3b4bb9806a96f6ecbe62
+  metadata.gz: a768330e59e468bf875d1567dfe47c6394f68a5499a49b7b89f8c9d6f8420d5b
+  data.tar.gz: 56d32aa536a4d8026cc9fd2270dc393490261874aea5cd26a12f9a24afbdd210
 SHA512:
-  metadata.gz: f1dd2dc7ef37ec1d64898455c009426f832c4e03794b19db00427fff1b227b3e8e32af9cdfba981f3179efed6c063283817ca1403dc0776a1591a10093e0c459
-  data.tar.gz: a16da3139579988c8cade1ff78efc87b57ffff59448affcb621c48b8c8e2d3839d1fffde6b2322bbe011f6e791c2ada60bd075d375ed7a78bda48028e25bb78d
+  metadata.gz: eb5ffef746dc3ff14cf364606054e043b31397b28c81d25cdeb3840fddf3e0a742b717797b2b453f3f78b3a3e2ad4b6d413020062e15b9e64cda87adb6b756da
+  data.tar.gz: 0cc3783bb8eddf18ca44edf6f1986dfe4e103a2af9930ef2ecf46a1b02fbe6bc5102b1a80fb24705fcaf61fadc16cc173fcf48bb485cc1ce5fcbbe50b3e9eb42

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

@@ -91,9 +91,6 @@ hr {
   width: 100px;
 }
 
-.inline {
-  display: inline;
-}
 ul.inline li {
   display: inline;
 }

data/app/controllers/ish_manager/galleries_controller.rb

@@ -1,13 +1,13 @@
 class IshManager::GalleriesController < IshManager::ApplicationController
 
   before_action :set_lists
-  
+
   def index
     authorize! :index, Gallery
     @galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
       ).order_by( :created_at => :desc )
     if params[:q]
-      @galleries = @galleries.where({ :name => /#{params[:q]}/i })      
+      @galleries = @galleries.where({ :name => /#{params[:q]}/i })
     end
     @galleries = @galleries.page( params[:galleries_page] ).per( 20 )
 
@@ -16,8 +16,8 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def shared_with_me
     authorize! :index, Gallery
-    @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false 
-      ).order_by( :created_at => :desc 
+    @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
+      ).order_by( :created_at => :desc
       ).page( params[:shared_galleries_page] ).per( 10 )
     render params[:render_type]
   end
@@ -68,7 +68,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
     # puts! params[:gallery][:shared_profiles], 'shared profiles'
     if @gallery.update_attributes( params[:gallery].permit! )
-      new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids] 
+      new_shared_profiles = IshModels::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.'
@@ -78,7 +78,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
       flash[:alert] = 'No Luck. ' + @gallery.errors.messages.to_s
       render :action => :edit
     end
-  end                           
+  end
 
   def show
     begin

data/app/controllers/ish_manager/videos_controller.rb

@@ -2,7 +2,7 @@
 class IshManager::VideosController < IshManager::ApplicationController
 
   before_action :set_lists
-  
+
   def index
     authorize! :index, Video.new
     @videos = Video.unscoped.where( is_trash: false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
@@ -16,12 +16,16 @@ class IshManager::VideosController < IshManager::ApplicationController
       tag = Tag.find params[:tag_id]
       @videos = @videos.where( :tag => tag )
     end
-    
+
     if params[:site_id]
       @site = Site.find params[:site_id]
       @videos = @site.videos
     end
-    
+
+    if params[:q]
+      @videos = @videos.where({ :name => /#{params[:q]}/i })
+    end
+
     @videos = @videos.page( params[:videos_page] )
 
     respond_to do |format|
@@ -54,7 +58,7 @@ class IshManager::VideosController < IshManager::ApplicationController
     @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
     @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 |)
@@ -69,9 +73,9 @@ class IshManager::VideosController < IshManager::ApplicationController
       end
     end
     authorize! :create, @video
-    
+
     if @video.save
-      flash[:notice] = 'Success'      
+      flash[:notice] = 'Success'
       redirect_to videos_path
     else
       flash[:alert] = 'No luck'
@@ -80,11 +84,12 @@ class IshManager::VideosController < IshManager::ApplicationController
       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
@@ -118,5 +123,5 @@ class IshManager::VideosController < IshManager::ApplicationController
     end
     redirect_to :action => 'index'
   end
-  
+
 end

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

@@ -21,14 +21,13 @@
             %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
+            -# %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
 
         - proc do # nothing
           %ul.nav.nav-pills

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

@@ -1,6 +1,6 @@
 
 - # @TODO: definitely more abstract
-- path ||= galleries_path 
+- path ||= galleries_path
 
 = form_tag path, :method => :get, :class => :search do
   .field.search_words

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

@@ -3,7 +3,7 @@
   .row
     .col-sm-12.col-md-12
       %h1.center #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
-      = render 'search'
+      = render 'search', path: galleries_path
       %ul.menu-secondary
         %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
           = link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )

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

@@ -2,7 +2,7 @@
 %h5
   User Profiles (#{@user_profiles.count})
   = link_to '[+]', new_user_profile_path
- 
+
 
 - @user_profiles.each do |profile|
   .panel
@@ -17,7 +17,6 @@
             %li <b>Role:</b> #{profile.role_name}
             %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
             %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
-            %li <b>About:</b> #{profile.about}
         .col-sm-8
           %h5 Shared galleries
           - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|

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

@@ -1,7 +1,7 @@
 
 = form_for video do |f|
   = render 'form_errors', :item => @video
- 
+
   .row
     .col-md-6
       .field
@@ -32,7 +32,10 @@
       = f.number_field :premium_tier
     .col-sm-3
       = f.label :site
-      = select :gallery, :site_id, @sites_list
+      = f.select :site_id, @sites_list
+    .col-sm-3
+      = f.label :user_profile
+      = f.select :user_profile_id, @user_profiles_list
   .row
     .col-sm-4
       = f.check_box :is_public

data/app/views/ish_manager/videos/_index.haml

@@ -6,27 +6,23 @@
       Videos (#{videos.count})
       = link_to '[+]', new_video_path
     %br
-    
+
     = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
-    
+
     - videos.each do |video|
       .panel
         .panel-content
           .row
-            .col-xs-12.col-sm-6
-              .center
+            .col-sm-6
+              .float-left
+                .thumb= image_tag video.thumb.url(:thumb)
+              .a
                 = link_to video.name, video_path( video )
                 .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
                 = link_to '[~]', edit_video_path( video )
-                = render 'meta', :item => video
-                = image_tag video.thumb.url(:thumb)
-            .col-xs-12.col-sm-6
-              .center
-                - if @current_user.profile.videos_embed
-                  = render 'ish_manager/videos/embed', :video => video
-                - else
-                  = render 'ish_manager/videos/preview', :video => video
-        
+              = render 'meta', :item => video
+              .c
+
     = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
 %hr
 

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

@@ -1,4 +1,6 @@
 
 = render 'ish_manager/sites/header', :site => @site if @site
-= render 'index', :videos => @videos
 
+= render 'search', path: videos_path
+
+= render 'index', :videos => @videos

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

@@ -15,4 +15,6 @@
     %hr
     = link_to @video.video.url, @video.video.url
 
-    -# = render 'disqus'
+    %p <b>User Profile:</b> #{@video.user_profile.name}
+
+= @video.inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.220
+  version: 0.1.8.225
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails