ish_manager 0.1.8.294 → 0.1.8.298

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10efaa6d13f13e13e3f52df8ec0f7ab53a181e8e91c56cfa06f22155275c9fa6
-  data.tar.gz: cf51a5eeaf45dfaf848c1a86b4d18fdeff58484589c7195dab89d6c7ac4412c2
+  metadata.gz: 633c637aedac1a994211764707c2ebad1b69cd97410a1c90451f77c8a1cc3485
+  data.tar.gz: b4ca5ba260cb3476de1f41c5b2cce4d0bf70c4bb92cf632b297a17cd1af61e21
 SHA512:
-  metadata.gz: dd315d76a411fcdb406f2c37bce0961fc2a8a9dafbb61c758f6235e8c42c479793538d20dd46c13c3386caadf292d95ac16dedf0caeeb3f7e041f95fdbf6eb93
-  data.tar.gz: d719654b830ef000c0cfad3d4a582503a12b041c1da70f04c747045d7761a9a42ac5c3748d4e3af0408603f2c2f827fb26a1394ae75d5355c7d027c360210104
+  metadata.gz: b5ebf371b3be78b358e86b7b9745e8bb8d939eecf0bc34b3ef8248fbe5e8cf33844fa66947ac65e68ecc39000ff67eb9bc6b1e1b1d37a2ad31b3c21805b56452
+  data.tar.gz: c9cf963d8c86ae4e06dfd9067dd7d7a19decfe0aac69ea56f70ed7eb7ff59deea83f9326bc6f8d55edd6bb06d3bcedc77d9ccf95dfe55d4cdaa15025a36c6aa0

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

@@ -62,8 +62,13 @@ ul:not(.browser-default).bullets, {
 
 /* A */
 
-.addToggle + * {
-  display: none;
+.addToggle::after {
+  content: " [<>]";
+}
+.addToggle {
+  + * {
+    display: none;
+  }
 }
 .alert {
   border: 1px solid yellow;
@@ -92,11 +97,19 @@ ul:not(.browser-default).bullets, {
   padding: .5em;
   border-radius: 8px;
   margin-bottom: .5em;
+  padding: 0.5em;
 }
 
 
 /* C */
 
+.Card {
+  border: 1px solid gray;
+  border-radius: 8px;
+  display: inline-block;
+  margin-bottom: .5em;
+}
+
 .center {
   text-align: center;
 }
@@ -111,8 +124,17 @@ ul:not(.browser-default).bullets, {
 
 /* D */
 /* E */
+.error_explanation {
+  border: 1px solid red;
+  padding: .8em;
+}
+
 /* F */
 
+.--form {
+  margin-bottom: 2em;
+}
+
 .flat-row {
   display: flex;
   flex-direction: row;
@@ -226,6 +248,13 @@ textarea.large {
   display: inline;
 }
 
+/* N */
+
+.notice {
+  border: 1px solid green;
+  padding: .8em;
+}
+
 /* P */
 .panel-content {
   padding: .5em;
@@ -246,10 +275,7 @@ ul.inline li {
   padding-right: 1em;
 }
 
-.notice {
-  border: 1px solid green;
-  padding: .8em;
-}
+
 
 .youtube_img {
   width: 100px;

data/app/controllers/ish_manager/galleries_controller.rb

@@ -1,6 +1,7 @@
 class IshManager::GalleriesController < IshManager::ApplicationController
 
   before_action :set_lists
+  before_action :set_gallery, only: %w|destroy edit j_show show update|
 
   # alphabetized! : )
 
@@ -24,7 +25,6 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   end
 
   def destroy
-    @gallery = Gallery.unscoped.find params[:id]
     authorize! :destroy, @gallery
     @gallery.is_trash = true
     @gallery.save
@@ -33,27 +33,25 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   end
 
   def edit
-    @gallery = Gallery.unscoped.find params[:id]
     authorize! :edit, @gallery
   end
 
   def index
     authorize! :index, Gallery
     @galleries = Gallery.unscoped.where(
-      :is_done.in => [false, nil],
-      :is_trash.in => [false, nil],
-      :user_profile => current_user.profile
+      # :is_done.in => [false, nil],
+      # :is_trash.in => [false, nil],
+      # :user_profile => current_user.profile
     ).order_by( :created_at => :desc )
     if params[:q]
       @galleries = @galleries.where({ :name => /#{params[:q]}/i })
-      @galleries.selector.delete('is_done')
+      # @galleries.selector.delete('is_done')
     end
     @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
     render params[:render_type]
   end
 
   def j_show
-    @gallery = Gallery.unscoped.find( params[:id] )
     authorize! :show, @gallery
     respond_to do |format|
       format.json do
@@ -82,18 +80,12 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   end
 
   def show
-    begin
-      @gallery = Gallery.unscoped.find_by :slug => params[:id]
-    rescue
-      @gallery = Gallery.unscoped.find params[:id]
-    end
     authorize! :show, @gallery
     @photos = @gallery.photos.unscoped.where({ :is_trash => false })
     @deleted_photos = @gallery.photos.unscoped.where({ :is_trash => true })
   end
 
   def update
-    @gallery = Gallery.unscoped.find params[:id]
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
 
@@ -116,5 +108,15 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     end
   end
 
+  private
+
+  def set_gallery
+    begin
+      @gallery = Gallery.unscoped.find_by :slug => params[:id]
+    rescue
+      @gallery = Gallery.unscoped.find params[:id]
+    end
+  end
+
 end
 

data/app/controllers/ish_manager/videos_controller.rb

@@ -91,7 +91,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   end
 
   def show
-    @video = Video.unscoped.where( :youtube_id => params[:youtube_id] ).first
+    @video = Video.unscoped.where( :youtube_id => params[:youtube_id] ).first if params[:youtube_id].present?
     @video ||= Video.unscoped.find params[:id]
     authorize! :show, @video
 

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

@@ -1,7 +1,4 @@
 
 - if item.errors.any?
-  .error-explanation
-    %h5= t('e.there_are_errors')
-    %ul
-      - item.errors.full_messages.each do |msg|
-        %li= msg
+  .error_explanation
+    = "#{pluralize(item.errors.count, "error")} prohibited this map from being saved: #{item.errors.full_messages.join(", ")}."

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

@@ -30,6 +30,8 @@
             = form_tag videos_path, method: :get do
               = text_field_tag :q
           = link_to '[+]', new_video_path
+        %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }
+          = link_to 'Tags',      tags_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 (old m3)', stock_watches_path

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

@@ -4,7 +4,11 @@
 
 - url = params[:action] == 'new' ? maps_path : map_path(@map.id)
 
-= form_for @map, :html => { :multipart => true, class: 'maps--form' }, url: url do |f|
+
+= form_for @map, :html => { :multipart => true, class: '--form maps--form' }, url: url do |f|
+  .actions
+    = f.submit 'Save'
+
   - if @map.errors.any?
     #error_explanation
       %h2= "#{pluralize(@map.errors.count, "error")} prohibited this map from being saved:"
@@ -49,6 +53,11 @@
 
   = render 'ish_manager/application/form_nonpublic', f: f, model: @map
 
+
+  .row
+    = f.label :tags
+    = f.select :tag_ids, @tags_list, {}, { multiple: true }
+
   .field
     = f.label :description
     = f.text_area :description, class: 'tinymce'
@@ -66,7 +75,22 @@
       = f.label "Config"
       = f.text_area :config, class: 'large'
       %pre.small
-        description.collapsible: bool
-        map_panel_type: "Equirectangular" | "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1" | "ThreePanelV4"
+        :plain
+          description.collapsible: bool
+          map_panel_type: "Equirectangular" |
+            "MapPanel" | "MapPanelNoZoom" |
+            "ThreePanelV1" | "ThreePanelV4" |
+            "GoogleMaps"
+  .row
+    .col.s6
+      .google-maps.row
+        .col.s4
+          = f.label "x, y"
+        .col.s4
+          = f.text_field :x
+        .col.s4
+          = f.text_field :y
+    .col.s6
+      unused
   .actions
     = f.submit 'Save'

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

@@ -4,13 +4,12 @@
 
 .maps-show
   = render 'map_meta_row', map: @map
-  %p.addToggle Description [<>]
+  %p.addToggle Description
   .descr= raw @map.description
 
   %p.addToggle
     The Map (#{@map.w}x#{@map.h})
     = link_to 'Map Editor', location_map_editor_path(@map.id)
-    [<>]
   .the-map
     = image_tag @map.image.image.url(:original) rescue nil
     - @markers.each do |marker|
@@ -21,28 +20,13 @@
         - else
           = image_missing_tag
 
-  %p.addToggle Markers (#{@markers.count}) [<>]
-  .markers-list
-    - @markers.each do |marker|
-      .flex-row.bordered
-        - if marker.title_image
-          = image_tag marker.title_image.image.url(:original)
-        - else
-          = image_missing_tag
-        .flat-row
-          .a= marker.slug
-          .a= button_to '~', edit_marker_path(marker), method: :get
-          .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
-          .a= link_to '[api]', api_marker_path(marker)
-          .a= link_to '[this map]', edit_map_path(marker.slug)
-      .hide
-        %ul.bullets
-          %li <b>item_type:</b> #{marker.item_type}
-
-  %p.addToggle Newsitems (#{@map.newsitems.count}) [<>]
+  = render 'ish_manager/markers/header', markers: @markers, map: @map
+  = render 'ish_manager/markers/index', markers: @markers, map: @map
+
+  %p.addToggle= render 'ish_manager/newsitems/header', newsitems: @map.newsitems
   = render 'ish_manager/newsitems/index', newsitems: @map.newsitems
 
-  %p.addToggle Maps (#{@maps.count}) [<>]
+  %p.addToggle Maps (#{@maps.count})
   .maps-list
     - @maps.each do |m|
       .item

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

@@ -5,18 +5,12 @@
 
 -# @TODO: can I not have this url at all?
 - url = %w|new create|.include?(params[:action]) ? markers_path : marker_path(@marker.id)
+
 .markers--form
   = form_for @marker, :html => { :multipart => true }, url: url do |f|
-    -# @TODO: yeah move the map id into this hidden field.
-    -# = f.hidden_field :map_id, value: (params['map_id']||@map_id)
-
-    - if @marker.errors.any?
-      #error_explanation
-        %p= "#{pluralize(@marker.errors.count, "error")} prohibited this map from being saved:"
-        %ul.errors
-          - @marker.errors.full_messages.each do |message|
-            %li= message
-
+    = render 'ish_manager/application/form_errors', item: @marker
+    .actions
+      = f.submit 'Save'
     .row
       .col.s1
         = f.label :map
@@ -87,5 +81,17 @@
               = f.check_box :is_active
               = f.label :is_active
           .col.s6
-            .actions
-              = f.submit 'Save'
+            unused
+    .row
+      .col.s6
+        .google-maps.row
+          .col.s4
+            = f.label "x, y"
+          .col.s4
+            = f.text_field :x
+          .col.s4
+            = f.text_field :y
+      .col.s6
+        unused
+    .actions
+      = f.submit 'Save'

data/app/views/ish_manager/markers/_header.haml

@@ -0,0 +1,8 @@
+
+-#
+-# ish_manager / markers / _header.haml
+-#
+
+%p.addToggle
+  Markers (#{markers.count})
+  = link_to image_new, new_marker_path(map_id: map.id)

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

@@ -0,0 +1,18 @@
+
+.markers--index
+  - markers.each do |marker|
+    .Card
+      - if marker.title_image
+        = image_tag marker.title_image.image.url(:original)
+      - else
+        = image_missing_tag
+      .flex-row
+        .a= marker.slug
+        .a= button_to '~', edit_marker_path(marker), method: :get
+        .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
+      .flex-row
+        .a= link_to '[api]', api_marker_path(marker)
+        .a= link_to '[this map]', edit_map_path(marker.slug)
+    .hide
+      %ul.bullets
+        %li <b>item_type:</b> #{marker.item_type}

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

@@ -0,0 +1,3 @@
+
+-# %h5 Newsitems (#{newsitems.count}) #{link_to image_new, new_newsitem_path }
+Newsitems (#{newsitems.count}) #{link_to image_new, new_newsitem_path }

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

@@ -5,23 +5,9 @@
 - newsitems = newsitems.page( params[:newsitems_page] ).per( 10 )
 
 .manager-newsitems--index
-  %h5 Newsitems (#{newsitems.count}) #{link_to image_new, new_newsitem_path }
   = paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
   - newsitems.each do |n|
-    .card
-      .card-content
-        %ul
-          %li
-            .float-left= link_to '[~]', edit_newsitem_path(n)
-            .float-left= button_to '[x]', newsitem_path( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-            Name: #{n.name}
-          %li Desc: #{n.descr}
-          %li Created at: #{n.created_at}
-          %li Report id: #{n.report_id}
-          %li Gallery id: #{n.gallery_id}
-          %li username: #{n.username}
-          - if n.photo
-            %li Photo id: #{n.photo.id}
-        = render 'ish_manager/newsitems/item', :newsitem => n
+    = render 'ish_manager/newsitems/item', :newsitem => n
+
   = paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
 

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

@@ -1,9 +1,16 @@
+
+-#
+-# ish_manager / newsitems / _item.haml
+-#
+
 - n ||= newsitem
-.newsitems--item
-  -# - if n.profile_id
-  -#   = button_to '[x]', profile_newsitem_path(n.profile_id, n.id), method: :delete, data: { confirm: 'Are you sure?' }
-  - if !n.photo.blank?
-    .Nphoto.panel
+
+.card.newsitems--item{ class: n.item_type }
+  .card-content
+    .float-left= link_to '[~]', edit_newsitem_path(n)
+    .float-left= button_to '[x]', newsitem_path( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+
+    - if !n.photo.blank?
       .the-photo
         - if n.photo.gallery.blank?
           = link_to image_tag( n.photo.photo.url(:small) ), n.photo.photo.url(:large), :rel => 'lightbox[newsitem]'
@@ -11,8 +18,7 @@
           = link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.slug, n.photo.gallery.photos.index(n.photo) )
       .meta= render 'ish_manager/photos/meta', :photo => n.photo
 
-  - if n.report
-    .Nreport.newsitem-report
+    - if n.report
       %ul
         %li <b>Report</b> #{n.report.id}
         %li Premium Tier #{n.report.premium_tier}
@@ -26,9 +32,7 @@
       .subhead= n.report.subhead
       .c
 
-  - if !n.gallery.blank?
-    .Ngallery
-
+    - if !n.gallery.blank?
       %h3= link_to n.gallery.name, gallery_path(n.gallery.slug, 0)
       .meta
         #{t('newsitems.gallery', :username => n.gallery.username, :date => pretty_date(n.gallery.created_at))}
@@ -43,20 +47,20 @@
         .thumbnails
           - n.gallery.photos.where( :is_trash => false )[0...8].each do |photo|
             = link_to image_tag( photo.photo.url(:thumb), :alt => photo.name ), photo.photo.url(:small), :rel => "lightbox[#{n.gallery.slug}]"
-      .c
 
-  - if n.video_id
-    - video = Video.unscoped.find n.video_id
-    .Nvideo
-      = link_to video.video.url, video.video.url
-      -# %h3= link_to (video.name.blank? ? t('videos.no_title') : video.name), video_path(video.youtube_id)
-      = render 'ish_manager/application/meta', :item => video
-      = render 'ish_manager/videos/embed_half', :video => video
-      .c
 
-  - if !n.descr.blank? && n.gallery.blank? && n.report.blank?
-    .Ndescr.panel
-      .meta= pretty_date n.created_at
-      .subhead= simple_format n.descr
-      .c
+    - if n.video_id
+      - video = Video.unscoped.find n.video_id
+      .a
+        = link_to video.video.url, video.video.url
+        -# %h3= link_to (video.name.blank? ? t('videos.no_title') : video.name), video_path(video.youtube_id)
+        = render 'ish_manager/application/meta', :item => video
+        = render 'ish_manager/videos/embed_half', :video => video
+        .c
+
+    - if !n.descr.blank? && n.gallery.blank? && n.report.blank?
+      .Ndescr.panel
+        .meta= pretty_date n.created_at
+        .subhead= simple_format n.descr
+        .c
 

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

@@ -34,6 +34,10 @@
     .col.s12.m3
       = f.check_box :is_trash
       = f.label :is_trash
+  .row
+    = f.label :maps, 'Maps'
+    = f.select :map_ids, @maps_list, {}, { multiple: true }
+
   .row
     .actions
       %br

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.294
+  version: 0.1.8.298
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -205,7 +205,6 @@ files:
 - app/assets/images/bg/gplaypattern.png
 - app/assets/images/bg/triangular.png
 - app/assets/images/bg/weather-development.png
-- app/assets/images/bg/weather-development.png~
 - app/assets/images/bg/weather.png
 - app/assets/images/favicon.gif
 - app/assets/images/icons/10x10_red-cross.png
@@ -366,10 +365,13 @@ files:
 - app/views/ish_manager/maps/new.haml
 - app/views/ish_manager/maps/show.haml
 - app/views/ish_manager/markers/_form.haml
+- app/views/ish_manager/markers/_header.haml
+- app/views/ish_manager/markers/_index.haml
 - app/views/ish_manager/markers/_index_small.haml
 - app/views/ish_manager/markers/edit.haml
 - app/views/ish_manager/markers/new.haml
 - app/views/ish_manager/newsitems/_form.haml
+- app/views/ish_manager/newsitems/_header.haml
 - app/views/ish_manager/newsitems/_index.haml
 - app/views/ish_manager/newsitems/_item.haml
 - app/views/ish_manager/newsitems/edit.haml
@@ -406,13 +408,6 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
-- app/views/ish_manager/trash/option_watches-trash/_form.haml
-- app/views/ish_manager/trash/stock_actions/_form.haml
-- app/views/ish_manager/trash/stock_actions/index.haml
-- app/views/ish_manager/trash/stock_options/_form.haml
-- app/views/ish_manager/trash/stock_options/index.haml
-- app/views/ish_manager/trash/stock_watches/_form.haml
-- app/views/ish_manager/trash/stock_watches/index.haml
 - app/views/ish_manager/user_profiles/_form.haml
 - app/views/ish_manager/user_profiles/edit.haml
 - app/views/ish_manager/user_profiles/index.haml
@@ -444,7 +439,6 @@ files:
 - app/views/ish_manager/videos/show.haml
 - app/views/layouts/ish_manager/README.txt
 - app/views/layouts/ish_manager/application.haml
-- app/views/layouts/ish_manager/application.haml-trash
 - app/views/layouts/ish_manager/application2.haml
 - app/views/layouts/ish_manager/application_no_material.haml
 - config/routes.rb
@@ -456,7 +450,6 @@ files:
 - lib/ish_manager/version.rb
 - lib/tasks/ish_manager_tasks.rake
 - lib/tasks/migrate.rake
-- lib/tasks/warbler_tasks.rake-trash
 homepage: http://wasya.co
 licenses:
 - MIT

data/app/views/ish_manager/trash/option_watches-trash/_form.haml

@@ -1,37 +0,0 @@
-
-- if option_watch.persisted?
-  .float-left= button_to '[X]', option_watch_path(option_watch.id), method: :delete, data: { confirm: 'Are you sure?' }
-
-
-- url = option_watches_path if !option_watch.persisted?
-- url = option_watch_path( option_watch ) if option_watch.persisted?
-
-= form_for option_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
-  .flex-row
-    .form-group
-      = f.label :action
-      = f.select :action, options_for_select( Warbler::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => option_watch.action )
-    .form-group
-      = f.label :profile
-      = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => option_watch.profile ? option_watch.profile.id : nil )
-    .form-group
-      %label.control-label When
-      = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
-    .form-group
-      %label.control-label Type
-      = f.select :contractType, options_for_select( [['none',nil],['PUT', 'PUT'], ['CALL', 'CALL']], :selected => option_watch.contractType )
-    .form-group
-      %label.control-label On date
-      = f.text_field :date, :class => 'form-control', :placeholder => 'date'
-    .form-group
-      %label.control-label Strike
-      = f.number_field :strike, :step => 0.01, :placeholder => "0.01"
-    .form-group
-      %label.control-label Is
-      = f.select :direction, options_for_select( Warbler::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => option_watch.direction )
-    .form-group
-      %label.control-label Price
-      = f.number_field :price, :step => 0.01, :placeholder => "0.01"
-    .form-group
-      = f.submit ">", :class => %w(btn blue)
-

data/app/views/ish_manager/trash/stock_actions/_form.haml

@@ -1,27 +0,0 @@
-
--#
--# ish_manager / stock_actions / _form
--#
-  
-- url = stock_actions_path if !stock_action.persisted? 
-- url = stock_action_path( stock_action ) if stock_action.persisted?
-
-- if stock_action.profile
-  Belongs to #{stock_action.profile.email}
-= form_for stock_action, :url => url, :html => { :class => 'form-inline well' } do |f|
-  .form-group
-    %label.control-label Active?
-    = f.check_box :is_active
-  .form-group
-    - which_selected = stock_action.stock_watch ? stock_action.stock_watch.id : nil
-    %label.control-label When stock watch
-    = f.select :stock_watch, options_for_select( @stock_watches_list, :selected => which_selected )
-  .form-group
-    %label.control-label Sell options
-    - @stock_options_list.each do |item|
-      - checked = stock_action.stock_options.map(&:id).include?(item[1])
-      .stock-option
-        = f.check_box :stock_options, { :multiple => true, :checked => checked }, item[1], nil
-        = item[0]
-  .form-group
-    = f.submit ">", :class => %w(btn blue)

data/app/views/ish_manager/trash/stock_actions/index.haml

@@ -1,13 +0,0 @@
-
-%h4 Stock Actions
-
-%p <b>Note:</b> a stock option cannot belong to two actions.
-
-%hr
-- @stock_actions.each do |stock_action|
-  = render 'form', :stock_action => stock_action
-        
-%hr
-%h5 New
-= render 'form', :stock_action => @stock_action
-

data/app/views/ish_manager/trash/stock_options/_form.haml

@@ -1,22 +0,0 @@
-
-- url = stock_options_path if !stock_option.persisted? 
-- url = stock_options_path( stock_option ) if stock_option.persisted?
-
-- if stock_option.profile
-  Belongs to #{stock_option.profile.email}
-= form_for stock_option, :url => url, :html => { :class => 'form-inline well' } do |f|
-  .form-group
-    = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
-  .form-group
-    = f.text_field :expires_on, :class => 'form-control', :placeholder => 'YYYYMMDD' # :placeholder => 'MON(TH) DD YYYY'
-  .form-group
-    %label.control-label $
-    = f.number_field :strike, :step => 0.01, :class => 'form-control', :placeholder => '0.01'
-  .form-group
-    %label.control-label CALL/PUT?
-    = f.select :direction, options_for_select( Ish::StockOption::DIRECTIONS.map{|d|[d,d]}, :selected => stock_option.direction )
-  .form-group
-    %label.control-label quantity:
-    = f.number_field :quantity, :placeholder => 0
-  .form-group
-    = f.submit ">", :class => %w(btn blue)

data/app/views/ish_manager/trash/stock_options/index.haml

@@ -1,11 +0,0 @@
-
-%h4 Stock Options Index
-
-%hr
-- @stock_options.each do |stock_option|
-  = render 'form', :stock_option => stock_option
-        
-%hr
-%h5 New
-= render 'form', :stock_option => @stock_option
-

data/app/views/ish_manager/trash/stock_watches/_form.haml

@@ -1,28 +0,0 @@
-
-- if stock_watch.persisted?
-  .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_watch_path( stock_watch ) if stock_watch.persisted?
-
-= form_for stock_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
-  .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/app/views/ish_manager/trash/stock_watches/index.haml

@@ -1,24 +0,0 @@
-
-%h4 Stock Watches
-
-- @stock_watches.each do |stock|
-  %hr
-  = render 'form', :stock_watch => stock
-
-%hr
-%h5 New
-= render 'form', :stock_watch => @stock_watch
-
-
-%hr
-%hr
-
-%h4 Option Watches
-
-- @option_watches.each do |option|
-  %hr
-  = render 'ish_manager/option_watches/form', option_watch: option
-
-%hr
-%h5 New
-= render 'ish_manager/option_watches/form', option_watch: @option_watch

data/app/views/layouts/ish_manager/application.haml-trash

@@ -1,40 +0,0 @@
-!!!
-%html
-  %head
-    %title Ish Manager
-    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
-    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
-    %meta{ :charset => 'UTF-8' }
-    %meta{ :description => 'some description' }
-    %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
-    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
-    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
-    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
-    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
-    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
-    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
-
-    = stylesheet_link_tag "ish_manager/materialize", media: "all"
-    = stylesheet_link_tag "ish_manager/application", media: "all"
-
-    = javascript_include_tag "ish_manager/application"
-    = javascript_include_tag "ish_manager/materialize"
-
-    = csrf_meta_tags
-  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
-    .bg-white
-      - role = current_user ? current_user.profile.role_name : ''
-      = render :partial => "ish_manager/application/main_header_#{role}"
-      .container
-        .row
-          .col.s12
-            - if notice
-              %p.notice= notice
-            - if alert
-              %p.alert= alert
-      .container
-        = yield
-    = render 'ish_manager/application/main_footer'
-    = render 'analytics' unless Rails.env.development?
-    = render 'debug' if Rails.env.development?
-

data/lib/tasks/warbler_tasks.rake-trash

@@ -1,69 +0,0 @@
-
-def puts! a, b=''
-  puts "+++ +++ #{b}:"
-  pp a
-end
-
-namespace :warbler do
-
-  desc 'test placing orders for stock' do
-  task place_order_stock: :environment do
-    opts = {
-      "instruction": "BUY",
-      "price": "1.10",
-      "quantity": 1,
-      "symbol": "BAC",
-    }
-    out = Warbler::Ameritrade::Api.place_stock_limit_order opts
-    puts! out, 'out'
-  end
-
-  ## @TODO: this is still in ish_manager namespace, need to actually move it here.
-  desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
-  task watch_stocks: :environment do
-    while true
-      stocks = Warbler::StockWatch.where( notification_type: :EMAIL )
-      stocks.each do |stock|
-        begin
-          Timeout::timeout( 10 ) do
-            out = Warbler::Ameritrade::Api.get_quote({ symbol: stock.ticker })
-            r = out[:lastPrice]
-            if  stock.direction == :ABOVE && r >= stock.price ||
-                stock.direction == :BELOW && r <= stock.price
-              IshManager::ApplicationMailer.stock_alert( stock ).deliver
-            end
-          end
-        rescue Exception => e
-          puts! e, 'Error in ish_manager:watch_stocks :'
-        end
-      end
-      print '.'
-      sleep Warbler::StockWatch::SLEEP_TIME_SECONDS
-    end
-  end
-
-  desc 'watch option: contractType=PUT|CALL strike symbol date=yyyy-mm-dd'
-  task watch_options: :environment do
-    while true
-      option_watches = Warbler::OptionWatch.where( notification_type: :EMAIL )
-      option_watches.each do |option|
-        begin
-          Timeout::timeout( 10 ) do
-            ## opts = { contractType: 'PUT', strike: 355.0, symbol: 'NVDA', date: '2022-02-18' }
-            out = Warbler::Ameritrade::Api.get_option( option )
-            r = out[:last]
-            if  option.direction == :ABOVE && r >= option.price ||
-                option.direction == :BELOW && r <= option.price
-              IshManager::ApplicationMailer.option_alert( option ).deliver
-            end
-          end
-        rescue Exception => e
-          puts! e, 'Error in ish_manager:watch_options :'
-        end
-      end
-      print '.'
-      sleep Warbler::OptionWatch::SLEEP_TIME_SECONDS
-    end
-  end
-
-end