ish_manager 0.1.8.321 → 0.1.8.323

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

@@ -42,7 +42,7 @@
           = f.select :rated, options_for_select(Location::RATED_OPTIONS, selected: @map.rated)
         .field
           = f.label :creator_profile
-          = f.select :creator_profile, options_for_select(@user_profiles_list, selected: @current_user.profile.id)
+          = f.select :creator_profile, options_for_select(@user_profiles_list, selected: @current_profile.id)
 
       .col-sm-4
         .field
@@ -64,10 +64,6 @@
           = file_field_tag :image
           = image_tag @map.image.image.url(:thumb) rescue nil
 
-      .col-sm-4
-        = f.label :tags
-        = f.select :tag_ids, @tags_list, {}, { multiple: true }
-
       .col-sm-12
         = render 'ish_manager/application/form_nonpublic', f: f, model: @map
 
@@ -88,9 +84,16 @@
       .col.s6
         = f.label "Config"
         = f.text_area :config, class: 'large'
+
         %pre.small
           :plain
-            description.collapsible: bool
+            studio.hasFloor: bool
+            studio.studioLength: centimeters
+            studio.studioWidth: centimeters
+
+            <label>.collapsible: bool
+            eg: description.collapsible: bool
+
             map_panel_type: "Equirectangular" | "Panoramic" |
               "MapPanel" | "MapPanelNoZoom" |
               "ThreePanelV1" | "ThreePanelV1Fullscreen" |

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

@@ -48,6 +48,9 @@
         .field
           = f.label :y
           = f.text_field :y
+        .field
+          = f.label :z
+          = f.text_field :z
       .col-sm-3
         .field
           = f.label :title_image

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

@@ -2,16 +2,20 @@
 
 .markers--index.row
   - markers.each do |marker|
-    .col-sm-2
+    .col-sm-3
       .Card
         - if marker.title_image
           = image_tag marker.title_image.image.url(:thumb)
         - else
           = image_missing_tag
         .flex-row
-          .a= marker.destination&.name
+          %div{ class: marker.is_active ? 'is_active' : 'not_is_active' } #{marker.name}
+          - if marker.destination
+            .a <b>=></b> #{marker.destination&.name}
+        .flex-row
+          %div{ class: marker.is_3d ? 'is_3d' : 'not_is_3d' } [3d]
           .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.destination) if marker.destination
+          .a= link_to '[show]', edit_map_path(marker.destination) if marker.destination

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

@@ -8,12 +8,6 @@
       .field
         = f.label :map
         = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) ), {}, class: 'select2'
-      -# .field
-      -#   = f.label :site
-      -#   = f.select :site_id, options_for_select( @sites_list, :selected => ( newsitem[:site_id] || params[:site_id] ) )
-      -# .field
-      -#   = f.label :city
-      -#   = f.select :city_id, options_for_select( @cities_list, :selected => ( newsitem[:city_id] || params[:city_id] ) )
     .col-sm-6
       = f.submit :submit
 

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

@@ -36,13 +36,6 @@
       %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))}
-        - unless n.gallery.city.blank?
-          = t('cities.in')
-          = link_to n.gallery.city.name, city_path(n.gallery.city.cityname, :lang => :en)
-        - unless n.gallery.tags.blank?
-          = t('tags.in')
-          - n.gallery.tags do |tag|
-            = link_to tag, tag_path(tag.slug)
       - unless 0 == n.gallery.photos.length
         .thumbnails
           - n.gallery.photos.where( :is_trash => false )[0...8].each do |photo|

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

@@ -1,17 +1,8 @@
 
-- if defined? @city
-  - url = city_newsitem_path( @city, @newsitem ) if @city
-- if defined? @site
-  - url = site_newsitem_path( @site, @newsitem ) if @site
-
 .newsitems-edit
   %h1
     Edit Newsitem
-    - if @site
-      For site: #{@site.domain} #{@site.lang} <br />
-    - if @city
-      For city: #{@city.name} <br />
-  = render 'form', :newsitem => @newsitem, :url => url
+  = render 'form', :newsitem => @newsitem
 
 .debug
   = @newsitem.inspect

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

@@ -1,8 +1,2 @@
 
-- if @resource.class.name == 'Site'
-  = render 'ish_manager/sites/header', :site => @resource
-  = render 'index', :newsitems => @newsitems, :site => @resource
-  
-- if @resource.class.name == 'City'
-  = render 'ish_manager/cities/header', :city => @resource
-  = render 'index', :newsitems => @newsitems, :city => @resource
+= render 'ish_manager/newsitems/index', newsitems: @newsitems

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

@@ -2,9 +2,5 @@
 .newsitems-new
   %h1
     New Newsitem
-    - if @site
-      For Site #{@site.domain}
-    - if @city
-      For City #{@city.name}
   = render 'form', :newsitem => @newsitem
 

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

@@ -67,10 +67,6 @@
       unused
 
   .row
-    .col.s6
-      = f.label :tags
-      = f.select :tag_ids, @tags_list, {}, { multiple: true }
-
   .panel.panel-default
     .panel-heading
       %h3.panel-title Upload File

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

@@ -1,11 +1,8 @@
 
 - reports ||= @reports
 - reports = reports.page( params[:reports_page] ).per( 10 )
-- if defined? site
-  - new_path = new_site_report_path( site.id )
-- else
-  - new_path = new_report_path
-  
+- new_path = new_report_path
+
 .manager-reports--index
   .row
     .col.s12

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

@@ -27,10 +27,6 @@
         = f.select :role_name, options_for_select( [[nil, nil]] + Ish::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
         %label role name
 
-      .input-field
-        = f.select :current_city, options_for_select( @cities_list, :selected => profile.current_city_id )
-        %label City
-
       .input-field
         = f.label :fb_access_token
         = f.text_field :fb_access_token

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

@@ -1,5 +1,4 @@
 
-%h5 Editing profile of user `#{@profile.user&.email}`
-- if !@profile.user
-  .alert <b>Note:</b> This profile doesn't have an associated user.
+%h5 Editing profile for: `#{@profile.email}`
+
 = render 'form', :profile => @profile

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

@@ -10,5 +10,5 @@
   - @user_profiles.each do |profile|
     %li
       = link_to '[~]', edit_user_profile_path(profile)
-      = profile.user&.email
+      = profile.email
 

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

@@ -20,16 +20,10 @@
       .field
         = f.label :thumb
         = f.file_field :thumb
-      .field
-        = f.label :tags
-        = f.select :tag_ids, @tags_list, {}, { multiple: true }
   .row
     .col.s3
       = f.label :premium_tier
       = f.number_field :premium_tier
-    .col.s3
-      = f.label :site
-      = f.select :site_id, @sites_list
     .col.s3
       = f.label :user_profile
       = f.select :user_profile_id, @user_profiles_list

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

@@ -6,7 +6,7 @@
     = paginate videos, :param_name => :videos_page, :views_prefix => 'templates'
     - videos.each do |video|
       .callout
-        %h5= link_to (video.name.blank? ? t('videos.no_title') : video.name), sites_video_path( @site.domain, video.youtube_id )
+        %h5= link_to (video.name.blank? ? t('videos.no_title') : video.name), video_path( video.youtube_id )
         .text-center= render 'videos/embed', :video => video
         = video.descr
     = paginate videos, :param_name => :videos_page, :views_prefix => 'templates'

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

@@ -1,6 +1,6 @@
 
 - content_for :title do
-  #{@video.name} | #{@site ? @site.title : ''}
+  #{@video.name}
 
 .ish_manager-videos-show
   = link_to '[Back]', videos_path

data/config/routes.rb

@@ -50,6 +50,8 @@ IshManager::Engine.routes.draw do
   get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
   get 'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
   post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :email_context_send
+  get 'email_contexts', to: 'email_contexts#index', defaults: { notsent: false }, as: :email_contexts
+  get 'email_contexts/notsent', to: 'email_contexts#index', defaults: { notsent: true }, as: :notsent_email_contexts
   resources :email_contexts
 
   get 'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe

data/lib/ish_manager.rb

@@ -1,4 +1,5 @@
 
+require 'aws-sdk'
 require "ish_manager/engine"
 require 'haml'
 require 'cancancan'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.321
+  version: 0.1.8.323
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  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
@@ -280,12 +294,6 @@ files:
 - 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/trash/cities_controller.rb
-- app/controllers/ish_manager/trash/orders_controller.rb
-- app/controllers/ish_manager/trash/sites_controller.rb
-- app/controllers/ish_manager/trash/tags_controller.rb
-- app/controllers/ish_manager/trash/users_controller.rb
-- app/controllers/ish_manager/trash/venues_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/videos_controller.rb
 - app/helpers/ish_manager/application_helper.rb
@@ -304,6 +312,7 @@ files:
 - app/views/ish_manager/application/_main_header_admin.haml
 - app/views/ish_manager/application/_main_header_guy.haml
 - app/views/ish_manager/application/_meta.haml
+- app/views/ish_manager/application/_paginate.haml
 - app/views/ish_manager/application/_profile_pic.haml
 - app/views/ish_manager/application/_search.haml
 - app/views/ish_manager/application/home.haml
@@ -328,13 +337,7 @@ files:
 - app/views/ish_manager/email_templates/iframe_src.haml
 - app/views/ish_manager/email_templates/index.haml
 - app/views/ish_manager/email_templates/show.haml
-- app/views/ish_manager/features/_form.haml
-- app/views/ish_manager/features/_index.haml
-- app/views/ish_manager/features/_item.haml
-- app/views/ish_manager/features/edit.haml
-- app/views/ish_manager/features/index.haml
-- app/views/ish_manager/features/new.haml
-- app/views/ish_manager/features/show.haml
+- app/views/ish_manager/email_unsubscribes/new.haml
 - app/views/ish_manager/galleries/_form.haml
 - app/views/ish_manager/galleries/_index.haml
 - app/views/ish_manager/galleries/_index_title.haml
@@ -377,7 +380,6 @@ files:
 - 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-trash
 - app/views/ish_manager/markers/edit.haml
 - app/views/ish_manager/markers/new.haml
 - app/views/ish_manager/meetings/_form.haml
@@ -411,47 +413,6 @@ files:
 - app/views/ish_manager/reports/index.haml
 - app/views/ish_manager/reports/new.haml
 - app/views/ish_manager/reports/show.haml
-- app/views/ish_manager/tags/_features.haml
-- app/views/ish_manager/tags/_form.haml
-- app/views/ish_manager/tags/_index.haml
-- app/views/ish_manager/tags/_item.haml
-- app/views/ish_manager/tags/_list.haml
-- app/views/ish_manager/tags/_list_simple.haml
-- app/views/ish_manager/tags/_meta.haml
-- app/views/ish_manager/tags/edit.haml
-- 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/cities/_form.haml
-- app/views/ish_manager/trash/cities/_header.haml
-- app/views/ish_manager/trash/cities/edit.haml
-- app/views/ish_manager/trash/cities/edit_feature.haml
-- app/views/ish_manager/trash/cities/index.haml
-- app/views/ish_manager/trash/cities/new.haml
-- app/views/ish_manager/trash/cities/new_feature.haml
-- app/views/ish_manager/trash/cities/new_newsitem.haml
-- app/views/ish_manager/trash/cities/show.haml
-- app/views/ish_manager/trash/events/_form.haml
-- app/views/ish_manager/trash/events/_index.haml
-- app/views/ish_manager/trash/events/edit.haml
-- app/views/ish_manager/trash/events/index.haml
-- app/views/ish_manager/trash/events/new.haml
-- app/views/ish_manager/trash/meeting_mailer/README.txt
-- app/views/ish_manager/trash/sites/_form.haml
-- app/views/ish_manager/trash/sites/_header.haml
-- app/views/ish_manager/trash/sites/edit.haml
-- app/views/ish_manager/trash/sites/galleries.haml
-- app/views/ish_manager/trash/sites/index.haml
-- app/views/ish_manager/trash/sites/new.haml
-- app/views/ish_manager/trash/sites/show.haml
-- app/views/ish_manager/trash/venues/_form.haml
-- app/views/ish_manager/trash/venues/_index.haml
-- app/views/ish_manager/trash/venues/_search.haml
-- app/views/ish_manager/trash/venues/edit.haml
-- app/views/ish_manager/trash/venues/index.haml
-- app/views/ish_manager/trash/venues/new.haml
-- app/views/ish_manager/trash/venues/show.haml
-- app/views/ish_manager/unsubscribes/new.haml
 - app/views/ish_manager/user_profiles/_form.haml
 - app/views/ish_manager/user_profiles/_show.haml
 - app/views/ish_manager/user_profiles/edit.haml
@@ -478,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
 - config/routes.rb
 - lib/ish_manager.rb
 - lib/ish_manager/engine.rb

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

@@ -1,107 +0,0 @@
-class IshManager::CitiesController < IshManager::ApplicationController
-  before_action :set_lists, :only => [ :new_newsitem, :create_newsitem ]
-  before_action :sett_city, :only => [ :show, :edit ]
-
-  def index
-    authorize! :index, City
-    @cities = City.unscoped
-    @city = City.new
-    @photo = Photo.new
-  end
-
-  def show
-    authorize! :show, @city
-    @videos = @city.videos.page( params[:videos_page] ).per( Video::PER_PAGE )
-    @venues = @city.venues.page( params[:venues_page] ).per( Venue::PER_PAGE )
-    @galleries = @city.galleries.page( params[:galleries_page] ).per( Gallery::PER_PAGE )
-    @reports = @city.reports.page( params[:reports_page] ).per( Report::PER_PAGE )
-    @newsitems = @city.newsitems.page( params[:newsitems_page] ).per( Newsitem::PER_PAGE )
-    if params[:q]
-      @venues = @venues.where({ :name => /#{params[:q]}/i })
-    end
-  end
-
-  def new
-    @city = City.new
-    authorize! :new, City
-
-    @photo = Photo.new
-  end
-
-  def create
-    @city = City.new params[:city].permit!
-    authorize! :create, @city
-
-    if @city.save
-      flash[:notice] = 'Success'
-      redirect_to cities_path
-    else
-      flash[:alert] = 'No Luck'
-      render :action => :new
-    end
-  end
-
-  def edit
-    authorize! :edit, @city
-  end
-
-  def update
-    @city = City.find( params[:id] )
-    authorize! :update, @city
-    @city.update_attributes params[:city].permit!
-    if params[:photo]
-      photo = Photo.new :photo => params[:photo]
-      @city.profile_photo = photo
-    end
-    if @city.save
-      ::Ish::CacheKey.one.update_attributes( :cities => Time.now, :feature_cities => Time.now )
-      flash[:notice] = 'Success'
-      redirect_to city_path @city.id
-    else
-      flash[:alert] = 'No Luck. ' + @city.errors.inspect
-      @newsitems = @city.newsitems.all.page( params[:newsitems_page] )
-      @features = @city.features.all.page( params[:features_page] )
-      @photo = Photo.new
-      render :action => :edit
-    end
-  end
-
-  def change_profile_pic
-    authorize! :update, City
-    @city = City.find params[:id]
-    @photo = Photo.new params[:photo]
-    @photo.user = @current_user
-    flag = @photo.save
-    @city.profile_photo = @photo
-    flagg = @city.save
-    if flag && flagg
-      flash[:notice] = 'Success'
-    else
-      flash[:alert] = "No Luck. #{@photo.errors.messages} #{@city.errors.messages}"
-    end
-    redirect_to cities_path
-  end
-
-  def delete
-    c = City.find params[:id]
-    if c.delete
-      render
-    else
-      flash[:error] = c.errors.messages
-    end
-  end
-
-  private
-
-  def sett_city
-    @city = City.find params[:id]
-    @photo = Photo.new
-  end
-
-  def set_lists
-    @list_reports = Report.all.list
-    @list_galleries = Gallery.all.list
-    @list_users = [['', nil]] + User.all.order_by( :name => :asc ).map { |u| [u.username, u.username] }
-  end
-
-end

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

@@ -1,12 +0,0 @@
-
-class IshManager::OrdersController < IshManager::ApplicationController
-
-  before_action :set_lists
-
-  def index
-    @orders = ::CoTailors::Order.all
-    authorize! :index, CoTailors::Order
-  end
-
-end
-

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

@@ -1,95 +0,0 @@
-
-class IshManager::SitesController < IshManager::ApplicationController
-
-  # alphabetized
-
-  def create
-    authorize! :create, Site.new
-    params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ") if params[:site][:private_user_emails]
-    @site = Site.new params[:site].permit!
-    if @site.save
-      flash[:notice] = 'Success'
-    else
-      flash[:alert] = 'No Luck. ' + @site.errors.inspect
-    end
-
-    redirect_to sites_path
-  end
-
-  def edit
-    @site = Site.unscoped.find params[:id]
-    authorize! :update, @site
-  end
-
-  def galleries
-    @site = Site.find params[:site_id]
-    authorize! :galleries_index, @site
-    @galleries = @site.galleries.page( params[:galleries_page] )
-  end
-
-  def index
-    authorize! :sites_index, ::Manager
-    @site_groups = Site.where( :is_trash => false ).order_by( :lang => :desc ).group_by {|s|s.domain}
-  end
-
-  def new
-    @site = Site.new
-    authorize! :new, @site
-  end
-
-  def newsitem_delete
-    @site = Site.find params[:site_id]
-    authorize! :update, @site
-    n = @site.newsitems.find( params[:newsitem_id] )
-    n.delete
-    @site.touch
-    @site.save
-    flash[:notice] = 'Probably successfully deleted a newsitem.'
-    redirect_to site_path( @site.id )
-  end
-
-  def reports
-    @site = Site.find params[:site_id]
-    authorize! :reports_index, @site
-    @reports = @site.reports.page( params[:reports_page] )
-    render 'ish_manager/reports/index'
-  end
-
-  def show
-    @site = Site.unscoped.find params[:id]
-    authorize! :show, @site
-    @galleries = @site.galleries.page( params[:galleries_page] ).per( 10 )
-    @reports = @site.reports.page( params[:reports_page] ).per( 10 )
-    @videos = @site.videos.page( params[:videos_page] ).per( 5 )
-    @tags = Tag.where( :site_id => @site.id, :parent_tag_id => nil ).page( params[:tags_page] ).per( 100 )
-    @features = @site.features.limit( @site.n_features ) # page( params[:features_page] ).per( 9 )
-    @newsitems = @site.newsitems.page( params[:newsitems_page] ).per( @site.newsitems_per_page )
-  end
-
-  # not trash
-  def trash
-    @sites = Site.unscoped.where( :is_trash => true ).order_by( :domainname => :desc, :lang => :desc )
-    render :action => :index
-  end
-
-  def update
-    @site = Site.unscoped.find params[:id]
-    authorize! :update, @site
-
-    params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ")
-
-    if @site.update_attributes params[:site].permit!
-      flash[:notice] = 'Success'
-    else
-      flash[:alert] = 'No Luck'
-    end
-    redirect_to sites_path
-  end
-
-  #
-  # private
-  #
-  private
-
-end
-