ish_manager 0.1.8.434 → 0.1.8.436

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f59ba038998f76d3d5ecdcb6eb2f77479f920c263afe1d43ee460cf50ce3d544
-  data.tar.gz: f0644f8f8d78f5d4a28d890a0448b29c967ed409d06a809a006a4eede8aff31a
+  metadata.gz: 8fe0af2fe32744d65c81b4c43ece7e78dc43ed9f489d06b50d997a0eeae87ab2
+  data.tar.gz: b4b65f1f3e5f3eee1165abfed84b578ea1b1a160afa1dab15e7c1b421ecae2b6
 SHA512:
-  metadata.gz: a86169cf6c2e4b5c32474bca91829d70e78de53dad447e2f88d9cf1e3a9c52ecad7f9776a3ee480997a2109fab55e1cfbe967ad595ee52d6a25840a9dbc890a8
-  data.tar.gz: 28999bf3f30065d70c73698e26c1a46f194c4fbdc46c1cd75b4bcc346dcf732c3b11f315144b91ce74db1f69703eb8817acf1978f53e07e01832694cbecf3812
+  metadata.gz: 7469ea57788dff6abfb772046dbd54c88cbddd7f8f57b77fb5d16c4848fb13e47fbf6ba5b2f0709f48bf2061e9800a581e24a41e61751e98a4d689787316a6fa
+  data.tar.gz: 39beb58297123e266f857c567e2103dcd75662b8c2ab4f58ad1521211a5bd88113ce2f0eca1d1e1be65833975d02e2488348dc53cfe3d4f755460aeb3ee805fe

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

@@ -246,7 +246,6 @@ table.dataTable {
 .description {
   border: 1px solid red;
   padding: 1em;
-  font-size: 1.6em;
 }
 
 
@@ -430,6 +429,8 @@ textarea.large {
   display: inline;
 }
 
+
+
 /* N */
 
 .n-selected {

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

@@ -25,11 +25,6 @@ div.videos-show {
   margin: 0 auto;
   width: 640px;
 
-  .title {
-    font-size: 1.4em;
-    margin-left: .2em;
-  }
-
   .row {
     display: flex;
     margin: 0;

data/app/controllers/ish_manager/galleries_controller.rb

@@ -101,9 +101,9 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   end
 
   def update
-    old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
 
+    old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     if params[:gallery][:shared_profiles].present?
       params[:gallery][:shared_profiles].delete('')
     end

data/app/controllers/ish_manager/reports_controller.rb

@@ -56,15 +56,16 @@ class IshManager::ReportsController < IshManager::ApplicationController
   def index
     authorize! :index, Report
     @reports = Report.unscoped.order_by( :created_at => :desc
-      ).where( :is_trash => false, :user_profile => @current_profile
-      ).page( params[:reports_page] ).per( Report::PER_PAGE )
+      ).where( :is_trash => false, :user_profile => @current_profile )
     if params[:q]
-      @reports = @reports.or({ slug: /#{params[:q]}/i }, { name: /#{params[:q]}}/i }) # @TODO: why can't I have space in search term?
+      # @reports = @reports.or({ slug: /#{params[:q]}/i }, { name: /#{params[:q]}}/i }) # @TODO: why can't I have space in search term?
+      @reports = @reports.where({ :name => /#{params[:q]}/i })
       if @reports.length == 1
         redirect_to report_path(@reports[0])
         return
       end
     end
+    @reports = @reports.page( params[:reports_page] ).per( Report::PER_PAGE )
   end
 
   def new
@@ -94,6 +95,14 @@ class IshManager::ReportsController < IshManager::ApplicationController
       @report.update_attributes( :photo => photo, :updated_at => Time.now )
     end
 
+    old_shared_profile_ids = @report.shared_profiles.map(&:id)
+    if params[:report][:shared_profiles].present?
+      params[:report][:shared_profiles].delete('')
+    end
+    params[:report][:shared_profile_ids] = params[:report][:shared_profiles]
+    params[:report].delete :shared_profiles
+
+
     respond_to do |format|
       if @report.update_attributes(params[:report].permit!)
         format.html do

data/app/controllers/ish_manager/videos_controller.rb

@@ -40,7 +40,8 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   def index
     authorize! :index, Video.new
-    @videos = Video.unscoped.where( is_trash: false, :user_profile => @current_profile
+    @videos = Video.unscoped.where( is_trash: false,
+      :user_profile => @current_profile
     ).order_by( :created_at => :desc )
 
     if params[:q]
@@ -81,10 +82,24 @@ class IshManager::VideosController < IshManager::ApplicationController
     @video = Video.unscoped.find params[:id]
     authorize! :update, @video
 
+    old_shared_profile_ids = @video.shared_profile_ids
+    if params[:video][:shared_profiles].present?
+      params[:video][:shared_profiles].delete('')
+    end
+    params[:video][:shared_profile_ids] = params[:video][:shared_profiles]
+    params[:video].delete :shared_profiles
+
     @video.update params[:video].permit!
     if @video.save
+
+      # if params[:video][:shared_profile_ids].present?
+      #   new_shared_profiles = Ish::UserProfile.find( params[:video][:shared_profile_ids]
+      #     ).select { |p| !old_shared_profile_ids.include?( p.id ) }
+      #   ::IshManager::ApplicationMailer.shared_video( new_shared_profiles, @video ).deliver
+      # end
+
       flash[:notice] = 'Success.'
-      redirect_to videos_path
+      redirect_to video_path(@video)
     else
       flash[:alert] = "No luck: #{@video.errors.messages}"
       render :edit

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

@@ -3,11 +3,11 @@
 
   <b>On</b> #{item.created_at.to_s[0...10]}
   - if item.user_profile
-    <b>By:</b>
+    <b>By</b>
     = link_to item.user_profile.name, edit_user_profile_path( item.user_profile )
 
   -# - if item.tags.length > 0
   -#   <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
 
   - if defined?(item.premium_tier) && item.premium_tier > 0
-    <b>Tier:$#{item.premium_tier}</b>
+    <b>Tier $#{item.premium_tier}</b>

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

@@ -28,7 +28,8 @@
         = f.text_area :subhead
       .field
         = f.label :descr
-        = f.text_area :descr, :class => :tinymce
+        = f.text_area :descr
+        .descr= raw newsitem.descr
 
     .col-sm-6
       .field

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

@@ -1,8 +1,7 @@
 
-.newsitems-edit
+.newsitems-edit.max-width
   %h1
     Edit Newsitem
   = render 'form', :newsitem => @newsitem
 
-.debug
-  = @newsitem.inspect
+-# .debug= @newsitem.inspect

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

@@ -4,120 +4,114 @@
 
 - url ||= reports_path
 = form_for report, :url => url, :html => { :multipart => true } do |f|
-  - if report.errors.any?
-    #error_explanation
-      %h3= t('e.there_are_errors')
-      %ul
-        - report.errors.full_messages.each do |msg|
-          %li= msg
+
+  -# - if report.errors.any?
+  -#   #error_explanation
+  -#     %h3= t('e.there_are_errors')
+  -#     %ul
+  -#       - report.errors.full_messages.each do |msg|
+  -#         %li= msg
 
   .row
-    .col.s4
+    .col-md-6
       .field
         = f.label :"Name"
         = f.text_field :name, :class=> 'form-control', :placeholder => "name of report", :type => "text"
+      .field
         = f.label "Slug"
         = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
-
-    .col.s4
       .field
-        = f.label :subhead
-        = f.text_area :subhead, :class => 'form-control', :rows => "5", :style=> "resize: vertical;"
+        = f.label :created_at
+        = f.text_field :created_at
       .field
         = f.label "Item Type: default, longscroll"
         = f.text_field :item_type
 
-    .col.s4
-      .field
-        = f.label :created_at
-        = f.text_field :created_at
-
-  .field
-    = f.label :Description
-    = f.text_area :descr, :class => 'tinymce'
-  .field
-    = f.label :raw_json
-    = f.text_area :raw_json
-
-  %br
+    .col-md-6
+      = render 'ish_manager/application/form_nonpublic', f: f, model: report
 
   .row
-    .col.s4
+    .col-md-4
       .field
+        = f.label :Description
+        = f.text_area :descr
+    .col-md-4
+      .field
+        = f.label :raw_json
+        = f.text_area :raw_json
+    .col-md-4
+      .field
+        = f.label :subhead
+        = f.text_area :subhead, :class => 'form-control', :rows => "5", :style=> "resize: vertical;"
+
+  .row
+    .col-md-4
+      .field.my-row
         = f.label :Coordinates
-        .panel.panel-default
-          .panel-body
-            .col.s6
-              .form-group
-                %label{} X-coordinate
-                = f.text_field :x, :placeholder => "x", :type => "text", :class=>"form-control"
-
-            .col.s6
-              .form-group
-                %label{} Y-coordinate
-                = f.text_field :y, :placeholder => "y", :type => "text", :class=>"form-control"
-    .col.s4
+        = f.text_field :x, :placeholder => "x", :type => "text", :class=>"form-control"
+        = f.text_field :y, :placeholder => "y", :type => "text", :class=>"form-control"
+        = f.text_field :z, :placeholder => "z", :type => "text", :class=>"form-control"
+
+
+    .col-md-4
       .field
         = f.label :premium_tier
         = f.number_field :premium_tier
       .field
         = f.label :user_profile
         = select :report, :user_profile_id, @user_profiles_list
-    .col.s4
-      unused
 
-  .row
-  .panel.panel-default
-    .panel-heading
-      %h3.panel-title Upload File
-    .panel-body
-      .row
-        .col.s6.col.soffset-3
-          %button.btn.btn-primary.btn-lg.btn-block{:type => "button", :onClick => "upload()"} Upload File
-      = file_field_tag :photo, :style => "display:none", :id=>"photo"
-      .div.center
-        -# @TODO: wtf?
-        %img#thumbnail_image_boy.img-thumbnail{:alt => "uploaded image", :width=>"200px"}
-
-
-  :javascript
-
-      $( document ).ready(function() {
-      $(".caret").html("");
-      });
-
-      function upload(){
-        document.getElementById("photo").click();
-      }
+    .col-md-4
+      .panel.panel-default
+        .panel-heading
+          %h3.panel-title Upload File
+        .panel-body
+          .row
+            .col.s6.col.soffset-3
+              %button.btn.btn-primary.btn-lg.btn-block{:type => "button", :onClick => "upload()"} Upload File
+          = file_field_tag :photo, :style => "display:none", :id=>"photo"
+          .div.center
+            -# @TODO: wtf?
+            %img#thumbnail_image_boy.img-thumbnail{:alt => "uploaded image", :width=>"200px"}
+
+
+
 
-        function handleFileSelect(evt) {
-          var files = evt.target.files;
-
-          // Loop through the FileList and render image files as thumbnails.
-          for (var i = 0, f; f = files[i]; i++) {
-            // Only process image files.
-            if (f.type.match('image.*')) {
-              var reader = new FileReader();
-
-              reader.onload = function (e) {
-                  // get loaded data and render thumbnail.
-                  document.getElementById("thumbnail_image_boy").src = e.target.result;
-              };
-
-              // read the image file as a data URL.
-              reader.readAsDataURL(f);
-            }else{
-              $("#photo").val("");
-              alert("Only images accepted.");
-            }
-          }
-        }
-        document.getElementById('photo').addEventListener('change', handleFileSelect, false);
 
-  .input
-    = f.check_box :is_public
-    = f.label :is_public
   .input
     = f.check_box :is_trash
     = f.label :is_trash
   %button.btn.btn-success{:type => "submit"} submit
+
+:javascript
+  $( document ).ready(function() {
+    $(".caret").html("");
+    });
+
+    function upload(){
+      document.getElementById("photo").click();
+    }
+
+    function handleFileSelect(evt) {
+      var files = evt.target.files;
+
+      // Loop through the FileList and render image files as thumbnails.
+      for (var i = 0, f; f = files[i]; i++) {
+        // Only process image files.
+        if (f.type.match('image.*')) {
+          var reader = new FileReader();
+
+          reader.onload = function (e) {
+              // get loaded data and render thumbnail.
+              document.getElementById("thumbnail_image_boy").src = e.target.result;
+          };
+
+          // read the image file as a data URL.
+          reader.readAsDataURL(f);
+        }else{
+          $("#photo").val("");
+          alert("Only images accepted.");
+        }
+      }
+    }
+    document.getElementById('photo').addEventListener('change', handleFileSelect, false);

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

@@ -1,6 +1,5 @@
 
-.row
-  .large-12.columns
+.reports-edit.max-width
     %h1 Edit Report #{@report.name}
 
     = render 'form', :url => report_path(@report.id), :report => @report

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

@@ -1,29 +1,29 @@
 
 -# ish_manager / reports / index
 
-.row
-  .large-12.columns
-    %h3
-      Reports (#{@reports.length})
-      = link_to image_new, new_report_path
+.reports-index.max-width
+  %h3
+    Reports (#{@reports.length})
+    = link_to image_new, new_report_path
 
-    = paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
+  = paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
 
-    - @reports.each do |report|
-      .card
-        .card-content
-          = link_to '[~]', edit_report_path( report )
-          .float-left= button_to '[x]', report_path( report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-          - if report.is_public
-            %i.material-icons visibility
-          - else
-            %i.material-icons visibility_off
-          = link_to report.name, report_path( report )
-          %br
-          .gray
-            = pp_date report.created_at
-          - if report.photo
-            = image_tag report.photo.photo.url :thumb
+  - @reports.each do |report|
+    .card
+      .card-content
+        = link_to '[~]', edit_report_path( report )
+        .float-left= button_to '[x]', report_path( report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+        - if report.is_public
+          %i.material-icons visibility
+        - else
+          %i.material-icons visibility_off
+        = link_to report.name, report_path( report )
+        %br
+        .gray
+          = pp_date report.created_at
+          slug: #{report.slug}
+        - if report.photo
+          = image_tag report.photo.photo.url :thumb
 
-    = paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
+  = paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
 

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

@@ -1,20 +1,20 @@
 
-.manager-reports-show
-  .row
-    .large-12.columns
-      %h1.flex-row
-        = @report.name
-        = link_to '[~]', edit_report_path( @report )
-        = button_to '[x]', report_path( @report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+.reports-show.max-width
 
-      = render 'meta', item: @report
+  %h1.flex-row
+    = @report.name
+    = link_to '[~]', edit_report_path( @report )
+    = button_to '[x]', report_path( @report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
 
-      - if @report.subhead.length > 3
-        .subhead= @report.subhead
+  = render 'meta', item: @report
+
+  - if @report.subhead.length > 3
+    .subhead= @report.subhead
+
+  .descr
+    - if @report.photo
+      .float-left= image_tag @report.photo.photo.url( :small )
+    = raw @report.descr
 
-      .descr
-        - if @report.photo
-          .float-left= image_tag @report.photo.photo.url( :small )
-        = raw @report.descr
   %hr
   = render 'form', :url => report_path(@report.id), :report => @report

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

@@ -12,5 +12,4 @@
     Payments (purchased items) (#{@profile.payments.length}):
     - @profile.payments.each do |payment|
       .Card.item
-        = payment.inspect
-        = payment.item&.inspect
+        = payment

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

@@ -1,7 +1,5 @@
 
 = form_for video do |f|
-  -# = render 'form_errors', :item => @video
-
   .row
     .col.m6
       .field
@@ -12,7 +10,7 @@
         = f.text_field :name
       .field
         = f.label :descr
-        = f.text_field :descr
+        = f.text_area :descr
     .col.m6
       .field
         = f.label :video
@@ -28,10 +26,9 @@
       = f.label :user_profile
       = f.select :user_profile_id, @user_profiles_list
   .row
-    .col.s4
-      = f.check_box :is_public
-      = f.label :is_public
-    .col.s4
+    .col-md-6
+      = render 'ish_manager/application/form_nonpublic', f: f, model: video
+    .col-md-6
       = f.check_box :is_trash
       = f.label :is_trash
 

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

@@ -10,15 +10,16 @@
   - else
     %iframe{:allowfullscreen => "true", :frameborder => "0", :height => "480", :src => "#{video.video.url}", :width => "640"}
 
-  .flex-row
+  .my-row
     .a= image_tag video.thumb.url(:thumb)
     .a
-      .title
+      %h3
         = video.name.blank? ? t('videos.no_title') : video.name
         .meta-edit
           .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
           = link_to '[~]', edit_video_path( video )
 
       = render 'ish_manager/application/metaline', :item => video
-      .flex-row= link_to video.video_file_name, video.video.url
+  .flex-row
+    Download File: #{link_to video.video_file_name, video.video.url}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.434
+  version: 0.1.8.436
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails