ish_manager 0.1.8.216 → 0.1.8.221

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b5a6397946f98611b448657c8ae78a4f18012c40b2e3cc696eed13b7acb78f4
-  data.tar.gz: 046eddb0c9c5876f8fbceae118e373ee02997db43ad1ccf83b49c0c1cd064b7e
+  metadata.gz: 51f674f0353e8b9c333c9a984c39b0ffbc3a8add7548125a37b61a959d941bab
+  data.tar.gz: 4e00972b73af87a2adf88bd80465082952e34b42320336771ca8d5a2ad504dac
 SHA512:
-  metadata.gz: 1b9ce87b17e16bd5e409cc146f7f41cf3aa8881afe9485e0040042d8342193d81845c2cb3ca389dce1508a7182c670053d6a7054a895753fa782ce11ae4e17dd
-  data.tar.gz: fe37678bcf85c80b629afa1aecdf09544a1267953dcd45ece3c3999386d24533a0f054f2db9d83b18027fc3d539e90465007c5206387aac958e41e314e171806
+  metadata.gz: 39be779fd1aa26366ba966cef841b3d7bcc57096f6b885064322c2603a9f06c3b987577f6123936b788ff7a3a85f085d2fbe0a429ec5e8cda84a387c74778749
+  data.tar.gz: fe99f72254c7fd87f63768df7b825798b69c458828dbe26138b9942ae7461d9e2b63a50913d6e0801bf0da8ccd7f0e61b0602349479edb4f342c87208b3fd80b

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

@@ -16,6 +16,7 @@
  *= require ish_manager/maps
  *= require ish_manager/utils
  *= require ish_manager/jquery-ui
+ *= require ish_manager/galleries
  */
 
 
@@ -58,7 +59,7 @@ hr {
   border: 1px solid red;
   width: 100px;
   height: 100px;
-}  
+}
 .large-photos img {
   width: 100%;
 }
@@ -90,9 +91,6 @@ hr {
   width: 100px;
 }
 
-.inline {
-  display: inline;
-}
 ul.inline li {
   display: inline;
 }
@@ -117,7 +115,7 @@ ul.inline li {
 }
 
 /**
- * manager... 
+ * manager...
  */
 
 .manager--main-header {

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

@@ -0,0 +1,22 @@
+
+.large-photos .item {
+  border: 1px solid red;
+  display: block;
+
+  padding: 10px;
+  margin: 10px;
+
+  height: 100vh;
+  max-width: 100vw;
+}
+
+.large-photos .item .wrapper {
+  width: 100%;
+  height: 100%;
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+.large-photos .item .wrapper img {
+  max-height: 100%;
+}

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/photos_controller.rb

@@ -3,7 +3,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
 
   # @TODO: this is bad? _vp_ 20170513
   skip_authorization_check :only => [ :j_create ]
-  protect_from_forgery :except => [ :j_create] 
+  protect_from_forgery :except => [ :j_create]
 
   def without_gallery
     @photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
@@ -12,10 +12,14 @@ class IshManager::PhotosController < IshManager::ApplicationController
   def destroy
     @photo = Photo.unscoped.find params[:id]
     authorize! :destroy, @photo
-    g = @photo.gallery
+    @photo.gallery.touch if @photo.gallery
     @photo.is_trash = true
-    @photo.save
-    g.touch
+    flag = @photo.save
+    if flag
+      flash[:notice] = "Success"
+    else
+      flash[:alert] = "No luck: #{@photo.errors.messages}"
+    end
     redirect_to request.referrer || root_path
   end
 
@@ -36,9 +40,9 @@ class IshManager::PhotosController < IshManager::ApplicationController
     authorize! :create_photo, gallery
 
     @photo = Photo.new params[:photo].permit!
-    @photo.is_public = true   
+    @photo.is_public = true
     @photo.gallery = gallery
-    
+
     # cache
     @photo.gallery.site.touch if @photo.gallery.site
     @photo.gallery.city.touch if @photo.gallery.city
@@ -55,7 +59,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
       }
       render :json => [ j ]
     else
-      render :json => { "errors" => @photo.errors } 
+      render :json => { "errors" => @photo.errors }
     end
   end
 

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,11 @@ class IshManager::VideosController < IshManager::ApplicationController
       render :action => 'new'
     end
   end
-  
+
   def edit
     @video = Video.unscoped.find params[:id]
     authorize! :edit, @video
-    
+
     @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
     @cities_list = City.list
   end
@@ -118,5 +122,5 @@ class IshManager::VideosController < IshManager::ApplicationController
     end
     redirect_to :action => 'index'
   end
-  
+
 end

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

@@ -14,13 +14,14 @@
             %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
 
           %ul.nav.nav-pills
-            %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_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            
+            %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
@@ -29,16 +30,18 @@
             %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
             %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
 
+        - proc do # nothing
           %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
-            
-            
+
+
   %hr
 

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/_index_thumbs.haml

@@ -0,0 +1 @@
+= render 'ish_manager/galleries/index'

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

@@ -0,0 +1 @@
+= render 'ish_manager/galleries/index'

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/galleries/_title.haml

@@ -3,7 +3,8 @@
   .col-xs-12
     .center
       %h2
-        #{gallery.name} (#{gallery.photos.length})
+        = link_to gallery.name, gallery_path(gallery)
+        (#{gallery.photos.length})
         = link_to '[~]', edit_gallery_path( gallery )
         [x]
       galleryname :: #{gallery.galleryname}

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

@@ -1,5 +1,5 @@
 
-= render 'title', :gallery => @gallery    
+= render 'title', :gallery => @gallery
 = render 'form', :gallery => @gallery, :url => gallery_path( @gallery )
 = render 'thumbs', :gallery => @gallery
 = render 'ish_manager/photos/multinew', :gallery => @gallery

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

@@ -1,5 +1,6 @@
 
 = render 'title', :gallery => @gallery
+= render 'ish_manager/photos/multinew', :gallery => @gallery
 
 -# deleted
 .row
@@ -32,6 +33,6 @@
 .center.large-photos
   - @photos.each do |photo|
     .item
-      = image_tag photo.photo.url( :large ), :alt => ''
-      %br
-      %br
+      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
+        = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.216
+  version: 0.1.8.221
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - app/assets/javascripts/ish_manager/materialize.js
 - app/assets/stylesheets/ish_manager/application.css
 - app/assets/stylesheets/ish_manager/bootstrap.css
+- app/assets/stylesheets/ish_manager/galleries.css
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/materialize.css
@@ -262,6 +263,8 @@ files:
 - app/views/ish_manager/friends/index.haml
 - app/views/ish_manager/galleries/_form.haml
 - app/views/ish_manager/galleries/_index.haml
+- app/views/ish_manager/galleries/_index_thumbs.haml
+- app/views/ish_manager/galleries/_index_title.haml
 - app/views/ish_manager/galleries/_menu.haml
 - app/views/ish_manager/galleries/_thumbs.haml
 - app/views/ish_manager/galleries/_title.haml