ish_manager 0.1.8.273 → 0.1.8.279

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c0df571cccbba8b3ed276c5f55a3d7844ce604ab125f6ba2b3a715a7fb1f33
-  data.tar.gz: 7737c072afbbab8effe0cc02220d8bdec141f00441628de1370407d1adae8fbd
+  metadata.gz: 5752af378c30ba802cffc2bf97691555c43792e1882b1999f3673af0c9eb86cf
+  data.tar.gz: c433e153fb732cfd0c9826ab711b73be0e99d18a198fb8ba4dea4b33d8c09fbc
 SHA512:
-  metadata.gz: 8c400ac8e69084f3fe0ccd866777742342d01b51d61cc48480d9362978413e7778d2bb7e60578c358c38a70dfe324d5844320b204abd07b52a4f3c1196f4ec0a
-  data.tar.gz: 6e6019328886d5dbc0592439336cab52eb2214c0203c5080cc2ac84b49af5d347924473b6770e338fc56462441ae5c924eb348112cb1c19023506542ea7e007f
+  metadata.gz: c1719b020d95788eacfcc5cccdca47a317a7fe67dd6d7fbd4317c2ad6fbe3c9cdcde6fe82df6a253c6c914ef8c6f2d35acc89a2076de69575fca35a63b8a859f
+  data.tar.gz: ec2d707acb1aa2d9b80aff4612be303d79a12f336eee5238ea898d06a5036b77e208865c6adef090bfa375f056539e5eba240a9946a191c471d5fe3cd9fa65c3

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

@@ -58,23 +58,6 @@ ul:not(.browser-default).bullets, {
 }
 
 
-.flat-row {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-content: flex-start;
-
-  height: 2.4em;
-  line-height: 3em;
-
-  width: 100%;
-  margin: 1em 0 0 0;
-  padding: 0;
-
-  > * {
-    padding-right: 1em;
-  }
-}
 
 
 /* A */
@@ -130,9 +113,28 @@ ul:not(.browser-default).bullets, {
 /* E */
 /* F */
 
+.flat-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-content: flex-start;
+
+  height: 2.4em;
+  line-height: 3em;
+
+  width: 100%;
+  margin: 1em 0 0 0;
+  padding: 0;
+
+  > * {
+    padding-right: 1em;
+  }
+}
+
+
 .flex-row {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: wrap; /* @TODO: why does it wrap? in ish_manager/show , I'd prefer it didn't. */
 }
 
 .float-left {
@@ -172,14 +174,6 @@ textarea.large {
 
 /* M */
 
-.menu-secondary li {
-  display: inline;
-}
-.menu-secondary li a {
-  padding: 1rem;
-  background: white;
-}
-
 
 .manager--main-header {
   background: url('/assets/bg/weather.png');
@@ -217,6 +211,16 @@ textarea.large {
   border-bottom: 1px solid red;
 }
 
+.menu-secondary li {
+  display: inline;
+}
+.menu-secondary li a {
+  padding: 1rem;
+  background: white;
+}
+.meta-edit {
+  display: inline;
+}
 
 /* P */
 .panel-content {

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

@@ -1 +1,26 @@
 
+.ish_manager-videos-show {
+  border-bottom: 2px solid red;
+  margin: 0 auto;
+  padding-bottom: .8em;
+  width: 640px;
+
+
+  .title {
+    font-size: 1.4em;
+    margin-left: .2em;
+  }
+
+  .row {
+    display: flex;
+    margin: 0;
+
+    img {
+      margin-right: .8em;
+      width: 100px;
+      height: 100px;
+    }
+  }
+
+
+}

data/app/controllers/ish_manager/videos_controller.rb

@@ -34,7 +34,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   def destroy
     @video = Video.unscoped.find params[:id]
     authorize! :destroy, @video
-    flag = @video.update_attributes( :is_trash => true )
+    flag = @video.delete
     @video.city.touch if @video.city
     @video.site.touch if @video.site
     @video.tags.map &:touch
@@ -91,7 +91,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   end
 
   def show
-    @video = Video.where( :youtube_id => params[:youtube_id] ).first
+    @video = Video.unscoped.where( :youtube_id => params[:youtube_id] ).first
     @video ||= Video.unscoped.find params[:id]
     authorize! :show, @video
 

data/app/mailers/ish_manager/application_mailer.rb

@@ -1,20 +1,9 @@
 
 module IshManager
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
+    default from: '314658@gmail.com'
     layout 'mailer'
 
-    def stock_alert stock
-      @stock = stock
-      mail( :to => stock.profile.email, :subject => "IshManager Stock Alert :: #{stock.ticker}" ).deliver
-    end
-
-    def condor_followup_alert args
-      @condor = Ish::IronCondor.find args[:condor_id]
-      @args = args
-      mail( to: 'piousbox@gmail.com', subject: "Condor Followup Alert :: #{condor.ticker} #{args.to_s}" ).deliver
-    end
-
     def shared_galleries profiles, gallery
       return if profiles.count == 0
       @gallery        = gallery
@@ -26,5 +15,12 @@ module IshManager
             :subject => 'You got new shared galleries on pi manager' ).deliver
     end
 
+
+    def stock_alert stock
+      @stock = stock
+      mail( :to => stock.profile.email, :subject => "IshManager Stock Alert :: #{stock.ticker}" ).deliver
+    end
+
+
   end
 end

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

@@ -0,0 +1,5 @@
+
+- if !video.youtube_id.blank?
+  = render 'embed_youtube', video: video
+- else
+  = render 'embed_s3', video: video

data/app/views/ish_manager/videos/_embed_s3.erb

@@ -0,0 +1,6 @@
+
+<div class="" style="" >
+  <!-- <iframe width="430" height="322" src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe> -->
+  <iframe width="640" height="480" src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe>
+  <!-- <iframe src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe> -->
+</div>

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

@@ -23,9 +23,8 @@
                 .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
+            = render 'meta_edit', item: video
+            = render 'meta', item: video
             .c
 
   = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'

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

@@ -0,0 +1,4 @@
+
+.meta-edit
+  .inline= button_to '[x]', video_path( item ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+  = link_to '[~]', edit_video_path( item )

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

@@ -2,19 +2,18 @@
 - content_for :title do
   #{@video.name} | #{@site ? @site.title : ''}
 
-.row
-  .large-12.columns
+.ish_manager-videos-show
+  = link_to '[Back]', videos_path
 
-    %h3
-      - if @video.name.blank?
-        = t('videos.no_title')
-      - else
-        = @video.name
-    = render 'ish_manager/application/meta', :item => @video
-    .text-center= render 'embed', :video => @video
-    %hr
-    = link_to @video.video.url, @video.video.url
+  = render 'embed', :video => @video
+
+  .row
+    = image_tag @video.thumb.url(:thumb)
+    .a
+      .title
+        = @video.name.blank? ? t('videos.no_title') : @video.name
+      .flex-row
+        = render 'meta_edit', item: @video
+        = render 'ish_manager/application/meta', :item => @video
+        = link_to @video.video_file_name, @video.video.url
 
-    %p <b>User Profile:</b> #{@video.user_profile.name}
-    %p= image_tag @video.thumb.url(:thumb)
-    %p <b>Video:</b> #{@video.inspect}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.273
+  version: 0.1.8.279
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,11 +209,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/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
@@ -360,14 +355,17 @@ files:
 - app/views/ish_manager/venues/index.haml
 - app/views/ish_manager/venues/new.haml
 - app/views/ish_manager/venues/show.haml
-- app/views/ish_manager/videos/_embed.erb
+- app/views/ish_manager/videos/_embed.haml
 - app/views/ish_manager/videos/_embed_half.erb
 - app/views/ish_manager/videos/_embed_mini.erb
+- app/views/ish_manager/videos/_embed_s3.erb
+- app/views/ish_manager/videos/_embed_youtube.erb
 - app/views/ish_manager/videos/_form.haml
 - app/views/ish_manager/videos/_index.haml
 - app/views/ish_manager/videos/_index_title.haml
 - app/views/ish_manager/videos/_list.haml
 - app/views/ish_manager/videos/_list_small.haml
+- app/views/ish_manager/videos/_meta_edit.haml
 - app/views/ish_manager/videos/_preview.haml
 - app/views/ish_manager/videos/edit.haml
 - app/views/ish_manager/videos/index.haml
@@ -401,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Summary of IshManager.

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

@@ -1,33 +0,0 @@
-
-class IshManager::CoTailorsController < IshManager::ApplicationController
-
-  def home
-    authorize! :home, ::CoTailors
-    @products = ::CoTailors::Product.all
-  end
-
-  def create_product
-    authorize! :create, ::CoTailors::Product
-    @product = ::CoTailors::Product.new params[:co_tailors_product].permit!
-    if @product.save
-      flash[:notice] = 'Created product'
-    else
-      flash[:alert] = 'Cannot create product: ', @product.errors.messages.to_s
-    end
-    redirect_to :action => 'home'
-  end
-
-  def update_product
-    @product = ::CoTailors::Product.find params[:id]
-    authorize! :update, @product
-    if @product.update_attributes params[:co_tailors_product].permit!
-      flash[:notice] = 'updated product'
-    else
-      flash[:alert] = 'Cannot update product: ', @product.errors.messages.to_s
-    end
-    redirect_to :action => 'home'
-  end
-
-
-end
-

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

@@ -1,9 +0,0 @@
-
-class IshManager::CoveredCallsController < IshManager::ApplicationController
-
-  def index
-    authorize! :index, Ish::CoveredCall
-  end
-
-end
-

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

@@ -1,65 +0,0 @@
-
-class IshManager::EventsController < IshManager::ApplicationController
-
-  before_action :set_lists
-
-  def index
-    authorize! :index, ::Event
-    @events = Event.all
-    if params[:city_id]
-      @resource = City.find( params[:city_id] )
-      @events = @resource.events
-    end
-  end
-
-  def new
-    @event = Event.new
-    authorize! :new, @event
-  end
-
-  def create
-    @event = Event.new params[:event].permit!
-    authorize! :create, @event
-    if @event.save
-      @event.city.touch
-      redirect_to :action => :index
-    else
-      flash[:alert] = @event.errors.messages
-      render :action => :new
-    end
-  end
-
-  def edit
-    @event = Event.find params[:id]
-    authorize! :edit, @event
-  end
-
-  def update
-    @event = Event.find params[:id]
-    authorize! :update, @event
-
-    if params[:photo]
-      photo = Photo.new :photo => params[:photo]
-      @event.profile_photo = photo
-    end
-
-    flag = @event.update_attributes params[:event].permit!
-    if flag
-      @event.city.touch
-      flash[:notice] = 'updated event'
-      redirect_to :action => :index
-    else
-      flash[:alert] = "No luck: #{@event.errors.messages}"
-      render :action => :edit
-    end
-  end
-
-  def show
-    @event = Event.find params[:id]
-    authorize! :show, @event
-    redirect_to :action => :edit, :id => @event.id
-  end
-
-end
-
-

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

@@ -1,28 +0,0 @@
-class IshManager::FriendsController < IshManager::ApplicationController
-
-  def index
-    authorize! :friends_index, Ish::UserProfile
-    @new_friend = Ish::UserProfile.new
-
-    @friends = current_user.profile.friends
-    friend_ids = @friends.map &:id
-  end
-
-  def create
-    @friend = ::Ish::UserProfile.find_by( :email => params[:friend][:email] ) # .includes( :shared_galleries )
-
-    authorize! :friends_new, @friend
-
-    me = current_user.profile
-    me.friends << @friend
-    if me.save
-      flash[:notice] = 'Added Friend'
-    else
-      flash[:alert] = "Cannot add friend: #{me.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-end
-
-

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

@@ -1,45 +0,0 @@
-
-class IshManager::IronCondorsController < IshManager::ApplicationController
-
-  def index
-    authorize! :index, ::Ish::IronCondor
-    @condors = ::Ish::IronCondor.all
-  end
-
-  def create
-    condor = ::Ish::IronCondor.new params[:ish_iron_condor].permit!
-    authorize! :create, condor
-    condor.ticker.upcase!
-    if condor.save
-      flash[:notice] = 'Success.'
-    else
-      flash[:alert] = condor.errors.messages.to_s
-    end
-    redirect_to action: :index
-  end
-
-  def update
-    condor = ::Ish::IronCondor.find params[:id]
-    authorize! :update, condor
-    condor.update params[:ish_iron_condor].permit!
-    condor.ticker.upcase!
-    if condor.save
-      flash[:notice] = 'Success.'
-    else
-      flash[:alert] = condor.errors.messages.to_s
-    end
-    redirect_to action: :index
-  end
-
-  def destroy
-    condor = ::Ish::IronCondor.find params[:id]
-    authorize! :destroy, condor
-    if condor.destroy
-      flash[:notice] = 'Success.'
-    else
-      flash[:alert] = condor.errors.messages.to_s
-    end
-    redirect_to action: :index
-  end
-
-end