ish_manager 0.1.8.287 → 0.1.8.288

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

@@ -7,23 +7,8 @@
     = image_tag @map.image.image.url(:original)
     - @markers.each do |m|
       .marker{ data: { 'slug': m.slug, 'center-offset-x': m.centerOffsetX, 'center-offset-y': m.centerOffsetY }, style: "top: #{m.y-m.centerOffsetY}px; left: #{m.x-m.centerOffsetX}px;" }
-        = image_tag m.image.image.url(:original)
+        = image_tag m.image ? m.image.image.url(:original) : image_missing
         = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{m.centerOffsetY-10}px; left: #{m.centerOffsetX-10}px;" )
 
-  .markers-list
-    %h1
-      Markers (#{@markers.length})
-      = link_to '[+]', new_marker_path({ map_id: @map.id })
-    - @markers.each do |m|
-      = form_for m, { html: { class: "item #{m.slug}" }, url: marker_path(m.id) } do |f|
-        = m.slug
-        = link_to '[~]', edit_marker_path(m.id)
-        .field
-          = f.label :x
-          = f.text_field :x
-        .field
-          = f.label :y
-          = f.text_field :y
-        .field
-          = f.submit 'Save'
+  = render 'ish_manager/markers/index_small', markers: @markers, map: @map
 

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

@@ -16,13 +16,19 @@
     - @markers.each do |marker|
       -# @TODO: this should be a partial
       .marker{ style: "position: absolute; left: #{marker.x - marker.centerOffsetX}px; top: #{marker.y - marker.centerOffsetY}px;" }
-        = image_tag marker.image.image.url(:original)
+        - if marker.image
+          = image_tag marker.image.image.url(:original)
+        - else
+          = image_missing_tag
 
   %p.addToggle Markers (#{@markers.count}) [<>]
   .markers-list
     - @markers.each do |marker|
       .flex-row.bordered
-        = image_tag marker.image.image.url(:original)
+        - 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
@@ -44,3 +50,5 @@
 
 %hr
 = render 'form'
+
+= button_to 'Export Subtree', export_map_path(@map.id, format: :json)

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

@@ -0,0 +1,28 @@
+
+.markers--index-small.markers-list
+  %h1
+    Markers (#{markers.length})
+    = link_to '[+]', new_marker_path({ map_id: map.id })
+  - markers.each do |m|
+    = form_for m, { html: { class: "item #{m.slug}" }, url: marker_path(m.id) } do |f|
+      .flex-row
+        .flex-column
+          .a= m.name
+          %b= m.slug
+        = link_to '[~]', edit_marker_path(m.id)
+      .flex-row
+        .flex-column
+          .a on map:
+          = image_tag( m.image ? m.image.image.url(:thumb) : image_missing )
+        .flex-column
+          .a title:
+          = image_tag( m.title_image ? m.title_image.image.url(:thumb) : image_missing )
+        .field
+          = f.label :x
+          = f.text_field :x
+        .field
+          = f.label :y
+          = f.text_field :y
+        .field
+          = f.submit 'Save'
+

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

@@ -2,8 +2,8 @@
 .photos-meta.row
   .meta
     On #{ pretty_date photo.created_at }
-    - unless photo.user.blank?
-      By #{ link_to photo.user.username, user_path(photo.user.username) }
+    -# - unless photo.user.blank?
+    -#   By #{ link_to photo.user.username, user_path(photo.user.username) }
     - unless photo.gallery.blank?
       In #{ link_to photo.gallery.name, gallery_path(photo.gallery.slug, 0) }
   = photo.name unless photo.name.blank?

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

@@ -15,5 +15,5 @@
       .flex-row
         = render 'meta_edit', item: @video
         = render 'ish_manager/application/meta', :item => @video
-        = link_to @video.video_file_name, @video.video.url
+      .flex-row= link_to @video.video_file_name, @video.video.url
 

data/app/views/layouts/ish_manager/README.txt

@@ -0,0 +1,3 @@
+
+The application2 and application layouts are the same. Let's converge.
+

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

@@ -0,0 +1 @@
+app/views/layouts/ish_manager/application2.haml

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

@@ -0,0 +1,40 @@
+!!!
+%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/app/views/layouts/ish_manager/application2.haml

@@ -2,42 +2,44 @@
 %html
   %head
     %title Ish Manager
-    %link{ :rel => 'icon', :href => '/favicon.ico?v=1' }
+    %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 => 'Ish CMS - Ish Manager' }
-
+    %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 "//cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"
     = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
-    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
     = 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#application_no_materialize
+  %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}"
+      = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
       .container
         .row
           .col.s12
             - if notice
+              - if notice.class == Array
+                %ul
+                  - notice.map do |n|
+                    %li
+                      - n.map do |k,v|
+                        <b>#{k} :</b> #{v}
               %p.notice= notice
             - if alert
               %p.alert= alert
       .container
         = yield
-    = render :partial => 'ish_manager/application/main_footer'
-    = render 'debug' if Rails.env.development?
-    %script{ src: "//cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js" }
-    :javascript
-      M.AutoInit();
+    = render 'ish_manager/application/main_footer'
+    = render 'analytics' if Rails.env.production?
+    = render 'debug' if !Rails.env.production?
+

data/config/routes.rb

@@ -33,6 +33,8 @@ IshManager::Engine.routes.draw do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
   end
 
+  get 'image_assets', to: 'image_assets#index', as: :image_assets
+
   resources :invoices do
     # resources :payments
   end
@@ -48,7 +50,10 @@ IshManager::Engine.routes.draw do
       resources 'markers'
       resources 'newsitems'
     end
+    post 'maps/import', to: 'maps#import', as: :import_map
     get 'maps/:id', to: 'maps#edit'
+    post 'maps/:id/export', to: 'maps#export', as: :export_map
+
     resources 'markers'
   end
 

data/config/systemd/system/README.txt

@@ -0,0 +1,3 @@
+
+actually /lib/systemd/system/watch_stocks.service
+

data/config/systemd/system/watch_stocks.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=watch stocks
+
+[Service]
+Type=forking
+WorkingDirectory=/home/ubuntu/projects/microsites3/current
+ExecStart=/usr/bin/bundle exec rake ish_manager:watch_stocks
+ExecStop=/bin/echo nothing
+Restart=on-failure
+Environment=RAILS_ENV=production
+
+[Install]
+WantedBy=multi-user.target

data/lib/ish_manager/engine.rb

@@ -12,6 +12,7 @@ module IshManager
     initializer "ish_manager.assets.precompile" do |app|
       app.config.assets.precompile << %w( ish_manager/application.js ish_manager/application.css )
       app.config.assets.precompile << %w( ish_manager/materialize.js ish_manager/materialize.css )
+      app.config.assets.precompile << %w( missing.png )
     end
   end
 end

data/lib/tasks/ish_manager_tasks.rake

@@ -18,6 +18,13 @@ namespace :ish_manager do
     puts 'OK'
   end
 
+  desc 'assign my creator_profile to Gameui::Marker where missing'
+  task :gameui_markers_creator_profile => :environment do
+    ms = Gameui::Marker.where( creator_profile_id: nil )
+    profile = User.find_by( email: 'piousbox@gmail.com' ).profile
+    ms.update_all( creator_profile_id: profile.id )
+  end
+
   desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
   task watch_stocks: :environment do
     while true

data/lib/tasks/migrate.rake

@@ -15,5 +15,20 @@ namespace :migrate do
     puts 'Each gallery is associated with a user profile.'
   end
 
+  desc 'destination for every marker'
+  task :markers_destinations => :environment do
+    ms = Marker.where( destination: nil )
+    ms.each do |m|
+      d = Map.where( slug: m.slug ).first
+      if d
+        m.destination = d
+        m.save
+        puts "Marker |#{m.name}| got destination |#{m.slug}|."
+      else
+        puts "+++ +++ #{m.slug}, No destination for this one."
+      end
+    end
+  end
+
 end
-  
+

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.287
+  version: 0.1.8.288
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +81,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: kaminari-mongoid
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari-actionview
+  name: ish_models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -81,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: kaminari-actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.3.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.3.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid_paranoia
+  name: mongoid-autoinc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mongoid-paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -123,33 +165,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid-autoinc
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 description: Description of IshManager.
 email:
 - piousbox@gmail.com
@@ -223,20 +265,18 @@ files:
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/campaigns_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
-- app/controllers/ish_manager/features_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
+- app/controllers/ish_manager/image_assets_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/maps_controller.rb
 - app/controllers/ish_manager/markers_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
-- app/controllers/ish_manager/option_watches_controller.rb
 - app/controllers/ish_manager/orders_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
 - 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/user_profiles_controller.rb
 - app/controllers/ish_manager/users_controller.rb
@@ -255,7 +295,6 @@ files:
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
 - app/views/ish_manager/application/_main_header_admin.haml
-- app/views/ish_manager/application/_main_header_admin.haml-trash
 - app/views/ish_manager/application/_main_header_guy.haml
 - app/views/ish_manager/application/_main_header_manager.haml
 - app/views/ish_manager/application/_meta.haml
@@ -303,6 +342,7 @@ files:
 - app/views/ish_manager/galleries/index_titles.haml
 - app/views/ish_manager/galleries/new.haml
 - app/views/ish_manager/galleries/show.haml
+- app/views/ish_manager/image_assets/index.haml
 - app/views/ish_manager/invoices/_form.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new.haml
@@ -322,11 +362,11 @@ files:
 - 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/map_editor.haml
 - 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/_index_small.haml
 - app/views/ish_manager/markers/edit.haml
 - app/views/ish_manager/markers/new.haml
 - app/views/ish_manager/newsitems/_form.haml
@@ -335,7 +375,6 @@ files:
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
-- app/views/ish_manager/option_watches/_form.haml
 - app/views/ish_manager/payments/index.haml
 - app/views/ish_manager/photos/_meta.haml
 - app/views/ish_manager/photos/_meta_manager.haml
@@ -356,12 +395,6 @@ files:
 - app/views/ish_manager/sites/index.haml
 - app/views/ish_manager/sites/new.haml
 - app/views/ish_manager/sites/show.haml
-- app/views/ish_manager/stock_actions/_form.haml
-- app/views/ish_manager/stock_actions/index.haml
-- app/views/ish_manager/stock_options/_form.haml
-- app/views/ish_manager/stock_options/index.haml
-- app/views/ish_manager/stock_watches/_form.haml
-- app/views/ish_manager/stock_watches/index.haml
 - app/views/ish_manager/tags/_features.haml
 - app/views/ish_manager/tags/_form.haml
 - app/views/ish_manager/tags/_index.haml
@@ -409,16 +442,19 @@ files:
 - app/views/ish_manager/videos/index.haml
 - app/views/ish_manager/videos/new.haml
 - 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
 - config/routes.rb
+- config/systemd/system/README.txt
+- config/systemd/system/stockwatcher.service
+- config/systemd/system/watch_stocks.service
 - lib/ish_manager.rb
 - lib/ish_manager/engine.rb
 - lib/ish_manager/version.rb
-- lib/systemd/system/watch_stocks.service
 - lib/tasks/ish_manager_tasks.rake
 - lib/tasks/migrate.rake
-- lib/tasks/warbler_tasks.rake
 - lib/tasks/warbler_tasks.rake-trash
 homepage: http://wasya.co
 licenses: