ish_manager 0.1.8.241 → 0.1.8.245

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e18f6d5504242e811b32534479efbde484ba91474cd7e7593fdf92bc4416eff1
-  data.tar.gz: f0f52556505d23e95d00b2a5560142069d1fa801c821ba9e443ad6a8f521b2b6
+  metadata.gz: bd7915ad6bfd53231f4546857b3ef2f2888387855d42acfe8bbb69bb2c20dfa7
+  data.tar.gz: fad21d67cb5a7b3c4bbf69648daa6bc48e0ea07d82d2cf184cc4324142e0a3d0
 SHA512:
-  metadata.gz: 3d44774fcd914ac3beb92afd360916f34dc2e7f2214433363c19e36dc536ec54f93c8f79d5ad9f5e59372164eae15affa2c7aa4c418e7fe8a019dd29486d6c93
-  data.tar.gz: cc2018aa43c15366480108791b094ae38f44a2f3953010d2163bc4a4745c933fe654c4a30145c5da0c1606d2666d542d7e67c288e33827063d94bd5eb8de0a2f
+  metadata.gz: 89c5da23f5ca2628dc6c6d2a6ac5c03edc8625b70b9ca20ccb35db62dfcda630be5c48bbc208df3f39ee746a844ecbb345e4d35a96c53d0f6441463a018b9338
+  data.tar.gz: 5f57513f152a76464c306f3741b5196eae35630b55bf64d4f6f70583dec4b9067971f5435ab54ea1ff7edf91292803e3cf5bbb6bfb1cdea8f699e2dc78d0daf3

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

@@ -11,12 +11,14 @@
  * It is generally better to create a new file per style scope.
  *
  *= require ish_manager/bootstrap
+ *= require ish_manager/reset
  *= require_self
  *= require ish_manager/tags
  *= require ish_manager/maps
  *= require ish_manager/utils
  *= require ish_manager/jquery-ui
  *= require ish_manager/galleries
+ *= require ish_manager/user_profiles
  */
 
 

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

@@ -1,4 +1,8 @@
 
+.panel-body img.thumb {
+  display: inline;
+}
+
 .large-photos .item {
   border: 1px solid red;
   display: block;

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

@@ -0,0 +1,96 @@
+/* Box sizing rules */
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+/* Remove default margin */
+body,
+h1,
+h2,
+h3,
+h4,
+p,
+figure,
+blockquote,
+dl,
+dd {
+  margin: 0;
+}
+
+/* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */
+ul[role='list'],
+ol[role='list'] {
+  list-style: none;
+}
+
+/* Set core root defaults */
+html:focus-within {
+  scroll-behavior: smooth;
+}
+
+/* Set core body defaults */
+body {
+  min-height: 100vh;
+  text-rendering: optimizeSpeed;
+  line-height: 1.5;
+}
+
+/* A elements that don't have a class get default styles */
+a:not([class]) {
+  text-decoration-skip-ink: auto;
+}
+
+/* Make images easier to work with */
+img,
+picture {
+  max-width: 100%;
+  display: block;
+}
+
+/* Inherit fonts for inputs and buttons */
+input,
+button,
+textarea,
+select {
+  font: inherit;
+}
+
+/* Remove all animations, transitions and smooth scroll for people that prefer not to see them */
+@media (prefers-reduced-motion: reduce) {
+  html:focus-within {
+   scroll-behavior: auto;
+  }
+
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+    scroll-behavior: auto !important;
+  }
+}
+
+
+html, body, div, span, applet, object, iframe,
+p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}

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

@@ -0,0 +1,9 @@
+
+.user-profiles--show {
+  ul ul {
+    margin-left: 1em;
+  }
+  ul li {
+    list-style-type: circle;
+  }
+}

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -3,9 +3,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def new
     @newsitem = Newsitem.new
-    @sites    = Site.list
-    @cities   = City.list
-    @tags     = Tag.list
+
+    @cities_list   = City.list
+    @maps_list     = ::Gameui::Map.list
+    @sites_list    = Site.list
+    @tags_list     = Tag.list
+
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem.city = @city
@@ -30,6 +33,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @resource ||= Tag.find params[:tag_id]                if params[:tag_id]
     @resource ||= Tag.find params[:newsitem][:tag_id]     if !params[:newsitem][:tag_id].blank?
     @resource ||= IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
+    @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
     @resource.newsitems << @newsitem
 
     authorize! :create_newsitem, @resource
@@ -52,7 +56,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     else
       root_path
     end
-    
+
     flag = @newsitem.save && @resource.save
     if flag
       @resource.touch
@@ -66,7 +70,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       render :action => :new
     end
   end
-  
+
   def destroy
     authorize! :destroy, Newsitem
     if params[:city_id]
@@ -121,7 +125,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     end
     authorize! :update, @newsitem
     flag = @newsitem.update_attributes params[:newsitem].permit!
-    
+
     if flag
       flash[:notice] = 'Success'
     else
@@ -130,7 +134,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
     redirect_to url
   end
-  
+
   def edit
     out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
     @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
@@ -144,7 +148,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem = @city.newsitems.find( params[:id] )
     end
     authorize! :edit, @newsitem
-    
+
   end
 
   def index

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

@@ -37,4 +37,6 @@
       %a{id: "large_#{photo.id}" }
       .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
       = link_to "large", photo.photo.url(:large)
+       | 
+      = link_to "original", photo.photo.url(:original)
       .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

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

@@ -12,7 +12,7 @@
         - @map.errors.full_messages.each do |message|
           %li= message
 
-  
+
   .row
     .col-md-3
       .field
@@ -32,7 +32,8 @@
         = f.number_field :h
   .field
     = f.label :description
-    = f.text_field :description
+    = f.text_area :description, class: 'tinymce'
+
   .field
     = f.label :img_path
     = f.text_field :img_path

data/app/views/ish_manager/maps/{_map_flat_row.haml → _map_meta_row.haml}

@@ -4,5 +4,6 @@
   .a= button_to '~', edit_map_path(map), method: :get
   .a <b>#{map.w}x#{map.h}_#{map.slug}</b>
   .a= button_to '+marker', new_map_marker_path(map), method: :get
+  .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
   .a= link_to '[api]', api_map_path(map)
   .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }

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

@@ -3,17 +3,4 @@
   %h1 Maps #{link_to '[+]', new_map_path}
   - @maps.each do |map|
     .item
-      .col
-        = render 'map_flat_row', map: map
-        %p= map.description
-        = image_tag map.img_path, width: 400
-      .col
-        .row
-          .a Markers (#{map.markers.length})
-          .a #{button_to '+', new_map_marker_path(map), method: :get}
-        %ul.markers
-          - map.markers.each do |marker|
-            %li
-              = marker.slug
-              = link_to '[~]', edit_marker_path(marker)
-
+      = render 'map_meta_row', map: map

data/app/views/ish_manager/maps/index.haml-trash

@@ -0,0 +1,17 @@
+
+.maps-index
+  %h1 Maps #{link_to '[+]', new_map_path}
+  - @maps.each do |map|
+    .item
+      .col
+        = render 'map_meta_row', map: map
+      .col
+        .row
+          .a Markers (#{map.markers.length})
+          .a #{button_to '+', new_map_marker_path(map), method: :get}
+        %ul.markers
+          - map.markers.each do |marker|
+            %li
+              = marker.slug
+              = link_to '[~]', edit_marker_path(marker)
+

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

@@ -1,13 +1,16 @@
 
 .maps-show
-  = render 'map_flat_row', map: @map
-  .descr= @map.description
+  = render 'map_meta_row', map: @map
+  %p.addToggle Description [<>]
+  .descr= raw @map.description
 
+  %p.addToggle The Map [<>]
   .the-map
     = image_tag @map.img_path, width: @map.w
     - @map.markers.each do |marker|
       .marker{ style: "position: absolute; left: #{marker.x}px; top: #{marker.y}px;" }= image_tag marker.img_path
 
+  %p.addToggle Markers (#{@map.markers.count}) [<>]
   .markers-list
     - @map.markers.each do |marker|
       .item
@@ -18,3 +21,9 @@
           .a= link_to '[api]', api_marker_path(marker)
         %ul.bullets
           %li <b>item_type:</b> #{marker.item_type}
+
+  %p.addToggle Newsitems (#{@map.newsitems.count}) [<>]
+  .newsitems-list
+    - @map.newsitems.each do |newsitem|
+      .item
+        = newsitem.inspect

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

@@ -2,17 +2,21 @@
 = form_for newsitem, :html => { :multipart => true } do |f|
   .row
     .col-sm-6{ style: 'border-right: 1px solid red;' }
+      %br
+      = f.label :map
+      = f.select :map_id, options_for_select( @maps_list, selected:( @map ? @map.id : params[:map_id] || nil ) )
+      %br
       = f.label :site
-      = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : nil ) )
+      = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : params[:site_id] || nil ) )
       %br
       = f.label :city
-      = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : nil ) )
+      = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : params[:city_id] || nil ) )
       %br
       = f.label :tag
-      = f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
+      = f.select :tag_id, options_for_select( @tags_list, selected:( @tag ? @tag.id : params[:tag_id] || nil ) )
       %br
       = f.label :user_profile
-      = f.select :user_profile_id, options_for_select( @user_profiles_list )
+      = f.select :user_profile_id, options_for_select( @user_profiles_list, selected: ( @user_profile ? @user_profile.id : params[:user_profile_id] || nil ) )
 
     .col-sm-6
       = f.label :name
@@ -33,7 +37,7 @@
       = f.label :report
       = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
   .a
-    
+
   .a
     = f.submit :submit
-  
+

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

@@ -28,13 +28,10 @@
   %br
 
   .row
-    .col-md-4
-      %label{} City
-      = select :report, :city_id, @cities_list, :class=>"btn"
-    .col-sm-4
-      = f.label :premium_tier
-      = f.number_field :premium_tier
     .col-md-4
+      .field
+        %label City
+        = select :report, :city_id, @cities_list, :class=>"btn"
       .field
         = f.label :Coordinates
         .panel.panel-default
@@ -48,6 +45,15 @@
               .form-group
                 %label{} Y-coordinate
                 = f.text_field :y, :placeholder => "y", :type => "text", :class=>"form-control"
+    .col-sm-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-md-4
+      unused
 
   .row
     .col-md-6

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

@@ -0,0 +1,15 @@
+
+.manager-reports--show-mini
+  .row
+    .large-12.columns
+      .title
+        = report.name
+        = link_to '[~]', edit_report_path( report )
+
+      .meta
+        On #{report.created_at.to_s.slice(0, 10)}
+        - if report.city
+          In #{link_to report.city.name, city_path( report.city )}
+
+      - if report.subhead.length > 3
+        .subhead= report.subhead

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

@@ -17,11 +17,11 @@
 
       - if @report.subhead.length > 3
         .subhead= @report.subhead
-        
+
       .descr
         - if @report.photo
           .float-left= image_tag @report.photo.photo.url( :small )
         = raw @report.descr
         .c
-          
+
       .c

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

@@ -10,9 +10,9 @@
       .row
         .col-sm-4
           %ul
-            %li= link_to '[edit]', edit_user_profile_path( profile )
-            %li <b>Email:</b> #{profile.email}
-            %li <b>username:</b> #{profile.username}
+            %li
+              <b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
+              = link_to '[edit]', edit_user_profile_path( profile )
             %li <b>Name:</b> #{profile.name}
             %li <b>Role:</b> #{profile.role_name}
             %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}

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

@@ -0,0 +1,14 @@
+
+.user-profiles--show
+  %ul
+    %li
+      User profile: #{@user_profile.inspect}
+    %li
+      Purchased Items:
+      %ul
+        - @user_profile.premium_purchases.each do |purchase|
+          %li
+            -# = purchase.item_type.constantize.find(purchase.item_id).inspect
+            = render 'ish_manager/reports/show_mini', report: purchase.item_type.constantize.find(purchase.item_id)
+
+

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

@@ -12,11 +12,14 @@
     %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 "ish_manager/application", media: "all"
+
     = stylesheet_link_tag "ish_manager/materialize", media: "all"
+    = stylesheet_link_tag "ish_manager/application", media: "all"
     = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
+
     = javascript_include_tag "ish_manager/application"
     = javascript_include_tag "ish_manager/materialize"
+
     = csrf_meta_tags
   %body#application
     .bg-white

data/config/routes.rb

@@ -16,7 +16,7 @@ IshManager::Engine.routes.draw do
   end
 
   resources :covered_calls
-  
+
   resources :email_templates
   resources :events
 
@@ -27,12 +27,12 @@ IshManager::Engine.routes.draw do
   get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
   get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
   get 'galleries/shared', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_THUMBS }
-  get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES 
+  get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES
     }, as: :galleries_shared_titles
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
   end
-  
+
   resources :invoices do
     # resources :payments
   end
@@ -45,6 +45,7 @@ IshManager::Engine.routes.draw do
   scope 'gameui' do
     resources 'maps' do
       resources 'markers'
+      resources 'newsitems'
     end
     resources 'markers' # redundant
   end
@@ -59,7 +60,7 @@ IshManager::Engine.routes.draw do
   resources :photos
   resources :payments
   ## profiles, see user_profiles
-  
+
   resources :reports
 
   resources :sites do
@@ -75,7 +76,7 @@ IshManager::Engine.routes.draw do
     resources :videos
     resources :tags
   end
-  
+
   # resources :stock_actions
   # resources :stock_options
   resources :stock_watches
@@ -98,5 +99,5 @@ IshManager::Engine.routes.draw do
 
   resources :venues
   resources :videos
-  
+
 end

data/lib/tasks/ish_manager_tasks.rake

@@ -51,7 +51,7 @@ namespace :ish_manager do
 =end
 
   desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
-  task :watch_stocks => :environment do
+  task watch_stocks: :environment do
     while true
       stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
       stocks.each do |stock|
@@ -82,6 +82,7 @@ namespace :ish_manager do
     end
   end
 
+=begin
   desc 'yahoo-watch the stocks'
   task :stockwatcher => :environment do
     watcher = YahooStockwatcher.new
@@ -91,5 +92,6 @@ namespace :ish_manager do
       sleep 60 # seconds
     end
   end
+=end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.241
+  version: 0.1.8.245
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,9 +180,11 @@ files:
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/maps.scss
 - app/assets/stylesheets/ish_manager/materialize.css
+- app/assets/stylesheets/ish_manager/reset.css
 - app/assets/stylesheets/ish_manager/tags.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
+- app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/utils.scss
 - app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
@@ -285,9 +287,10 @@ files:
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
 - app/views/ish_manager/maps/_form.haml
-- app/views/ish_manager/maps/_map_flat_row.haml
+- app/views/ish_manager/maps/_map_meta_row.haml
 - app/views/ish_manager/maps/edit.haml
 - app/views/ish_manager/maps/index.haml
+- app/views/ish_manager/maps/index.haml-trash
 - app/views/ish_manager/maps/new.haml
 - app/views/ish_manager/maps/show.haml
 - app/views/ish_manager/markers/_form.haml
@@ -306,6 +309,7 @@ files:
 - app/views/ish_manager/photos/without_gallery.haml
 - app/views/ish_manager/reports/_form.haml
 - app/views/ish_manager/reports/_index.haml
+- app/views/ish_manager/reports/_show_mini.haml
 - app/views/ish_manager/reports/edit.haml
 - app/views/ish_manager/reports/index.haml
 - app/views/ish_manager/reports/new.haml
@@ -337,6 +341,7 @@ files:
 - app/views/ish_manager/user_profiles/edit.haml
 - app/views/ish_manager/user_profiles/index.haml
 - app/views/ish_manager/user_profiles/new.haml
+- app/views/ish_manager/user_profiles/show.haml
 - app/views/ish_manager/users/_index.haml
 - app/views/ish_manager/venues/_form.haml
 - app/views/ish_manager/venues/_index.haml