ish_manager 0.1.8.292 → 0.1.8.295

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4740904cf7e96290ae43ff1789e260d1a34c3b53440fe6f2c3afbf06b7fb1795
-  data.tar.gz: 4bb0c0d7c3648251530855d4898e39b386dd98e07703ef65b05f6ca85a2d2a63
+  metadata.gz: 710c42d5d4473bd16149b60411ed55e98aaed91ced010d090acd6c01a1023fa9
+  data.tar.gz: 554ea35404e17e8b0a430c9cc6ed6ba360cdee0a3e9347a87ab142e576093e38
 SHA512:
-  metadata.gz: d080554a10a80da6c14abc8a62685a04ded22fcea0b116879dc1d4407a72ec4c8a170d25ae9580dbc3171c64fed4c0f080b6ba23f50aab5c415b17f051f451a3
-  data.tar.gz: 2ed755717c2a886b1080086bd4abdc0a0c84786ec32b7f117907c0f2961493ac46654f13c7291853d59adcaf3981951363e2660ebca57377ee14d1337e30ade2
+  metadata.gz: b33c41adf0b41179150e6f0e22f91a2fed188c48e6140962a0b6a999c33124de002ff4e6465406f88374207529a7e0b5d91cdcba9c2429e53c9d1675c8b635e0
+  data.tar.gz: a90c79990151ac36beaeab25012473698e170eb763074b480af38cf798cad029e9486d3c68e856d6675431c49b5bf7a706d67f29f79c1bc0dcd1ea74348f2c86

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/maps_controller.rb

@@ -4,6 +4,8 @@ class IshManager::MapsController < IshManager::ApplicationController
   before_action :set_map, only: [ :destroy, :edit, :export, :map_editor, :show, :update, ] # alphabetized
   before_action :set_lists
 
+  layout 'ish_manager/application_no_material', only: %w| index |
+
   # alphabetized
 
   def create
@@ -49,6 +51,9 @@ class IshManager::MapsController < IshManager::ApplicationController
     send_data result
   end
 
+  ##
+  ## @TODO: move to models, yes?
+  ##
   def import
     authorize! :create, Map
 
@@ -62,7 +67,21 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
     contents = JSON.parse contents
     contents.deep_symbolize_keys!
-    puts! contents, 'contents'
+
+    ## Delete existing
+    if params[:delete_existing]
+      map_ids = contents[:maps].map { |m| m[:_id] }
+      marker_ids = contents[:markers].map { |m| m[:_id] }
+
+      maps = Map.where( :_id.in => map_ids )
+      maps.each do |m|
+        marker_ids += m.markers.map(&:_id)
+      end
+      maps.destroy_all
+
+      Marker.where( :_id.in => marker_ids ).destroy_all
+    end
+
 
     ##
     ## process content
@@ -73,7 +92,6 @@ class IshManager::MapsController < IshManager::ApplicationController
     profiles = contents[:profiles]
     contents.delete :profiles
     profiles.each do |profile|
-      puts! profile, 'a profile'
       if Ish::UserProfile.where( _id: profile[:_id] ).first
         errors.push({ message: "profile #{profile[:email]} already exists." })
       else
@@ -96,11 +114,10 @@ class IshManager::MapsController < IshManager::ApplicationController
 
     # everything else
     contents.each do |k, v|
-      puts! [k,v], 'k-v'
+      # puts! [k, v], "Importing"
       item = Map.export_key_to_class[k].constantize
       v.map do |inn|
         n = item.new inn
-        puts! n, 'n'
         begin
           flag = n.save
         rescue Mongo::Error::OperationFailure => e
@@ -109,7 +126,6 @@ class IshManager::MapsController < IshManager::ApplicationController
         if flag
           errors.push({ class: k, id: inn[:_id], messages: 'ok' })
         else
-          puts! n.errors.full_messages.join(", ")
           errors.push({ class: k, id: inn[:_id], messages: "Could not save: |#{n.errors.full_messages.join(", ")}|." })
         end
       end

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,10 @@
       = 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"
   .actions
     = f.submit 'Save'

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

@@ -6,9 +6,13 @@
   %h1
     Maps (#{@maps.length})
     = link_to '[+]', new_map_path
+
   .red-border
     = form_tag import_map_path, :multipart => true do
       = file_field_tag :input
+      .a
+        = label_tag :delete_existing
+        = check_box_tag :delete_existing
       = submit_tag 'Import Map'
 
   - @maps.each do |map|

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
@@ -52,3 +36,6 @@
 = render 'form'
 
 = button_to 'Export Subtree', export_map_path(@map.id, format: :json)
+
+= render 'index_item', map: @map
+

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

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

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

@@ -0,0 +1,43 @@
+!!!
+%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/application", media: "all"
+
+    = javascript_include_tag "ish_manager/application"
+
+    = csrf_meta_tags
+  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
+    .bg-white
+      = 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 'ish_manager/application/main_footer'
+    = render 'analytics' if Rails.env.production?
+    = render 'debug' if !Rails.env.production?
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.292
+  version: 0.1.8.295
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -366,10 +366,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
@@ -446,6 +449,7 @@ files:
 - 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
 - config/systemd/system/README.txt
 - config/systemd/system/stockwatcher.service