ish_manager 0.1.8.320 → 0.1.8.321

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac66a26a9fff0be8e482db83b11f2722b4a1f6a7f231883ce400ee6e8d4c0086
-  data.tar.gz: 1a0dab969757ea87cb5d17529190296124a9e97f74815a63586fcc404cad81c8
+  metadata.gz: 7b554f3447bbf60499ac307a8efeb764f61f5db98d420ef4d927c5d6eed58ff7
+  data.tar.gz: 1b494df22a16f71380129f99a69a95acde34d52d217afb884f93486b7cc98dbb
 SHA512:
-  metadata.gz: 7fb00435a7c902e497a334a71dc26a4ece34e127e6be2a3f9f2b7d9cbd90fd2b54a5d117f50e8e458f82d3496f9e00b36ebb8f519bc697f3a749f578aca65e50
-  data.tar.gz: 2617d260f1498668323bf8b5a36fca1a9fa3e7cb2ca0ff0ccd5c75adbbe8c720e48c2720d967ef0a55e601b3a2806e9bf2a9351fe14e4023664e01a80d241ca2
+  metadata.gz: 821d34cfce66540bc6ccd23cfd653a8838e1bbabc6701e8caf2f93ff91d6cd5294ceeacd8a04d18af0e1dfb61a3a3b29ebbded4c211c2c8abe98b7883b21dde0
+  data.tar.gz: cfda033dae665b39fe6bc71614ad1ab1620217590ee313529f09e021496f8525a873d947a940846ef6af0606b6a19eaf75196dd34123dbe37f64036bc01d3613

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

@@ -4,7 +4,7 @@
  *= require ish_manager/jquery-ui
  *= require_self
  *
- * includes email contexts:
+ * includes email context:
  *= require ish_manager/email_templates
  *
  *= require ish_manager/galleries
@@ -12,7 +12,6 @@
  *= require ish_manager/markers
  *= require ish_manager/leads
  *= require ish_manager/photos
- *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
  *= require ish_manager/pagination
@@ -203,7 +202,7 @@ textarea.large {
 
 
 .main-header {
-  background: url('/assets/bg/weather.png');
+  background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
 
   a {
     background: white;
@@ -239,9 +238,8 @@ textarea.large {
   }
 }
 
-.main-header.development,
-.main-header.development_production {
-  background: url('/assets/bg/weather-development.png');
+.main-header.development {
+  background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192822/weather-bg-development.png');
 }
 
 .menu-secondary {
@@ -313,6 +311,10 @@ textarea.large {
 
 /* W */
 
+.W0 {
+  margin-top: 10px;
+}
+
 .WBordered {
   border: 1px solid gray;
   border-radius: 4px;

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

@@ -5,14 +5,16 @@
 }
 
 .galleries--title {
-  text-align: center;
+  // text-align: center;
 }
 
 .galleries-show {
-  .row {
-    display: block;
+  > * {
     border-bottom: 2px solid red;
+  }
 
+  > *:last-child {
+    border-bottom: none;
   }
 
   .row-large .goto {
@@ -30,7 +32,8 @@
 // }
 
 .row-large .item {
-  border: 1px solid red;
+  // border: 1px solid red;
+  border-radius: 20px;
 
   display: block;
   margin-bottom: 1em;

data/app/controllers/ish_manager/application_controller.rb

@@ -1,25 +1,11 @@
 module IshManager
   class ApplicationController < ActionController::Base
-    # protect_from_forgery :with => :exception, :prepend => true
+    protect_from_forgery :with => :exception, :prepend => true
     before_action :set_current_ability
     before_action :set_changelog
     check_authorization
     rescue_from ::CanCan::AccessDenied, :with => :access_denied
 
-    def email_test
-      authorize! :home, IshManager::Ability
-      IshManager::ApplicationMailer.test_email(' 3dva ').deliver_later
-
-      # wait_until = "2022-05-03T15:09".to_datetime.in_time_zone
-      # puts! wait_until, 'wait untl'
-
-      # # IshManager::TestEmailJob.set({ wait_until: wait_until }).perform_later
-      # IshManager::TestEmailJob.perform_later
-
-      flash[:notice] = 'Scheduled delivery.'
-      redirect_to request.referrer
-    end
-
     def home
       authorize! :home, IshManager::Ability
       render 'home'
@@ -35,16 +21,16 @@ module IshManager
     end
 
     def set_current_ability
-      @current_ability ||= ::IshManager::Ability.new( current_user )
+      @current_profile ||= ::Ish::UserProfile.find_by({ email: current_user.email })
+      @current_ability ||= ::IshManager::Ability.new( @current_profile )
     end
 
+    # @TODO: obsolete, remove _vp_ 2022-10-15
     def set_lists
       # alphabetized! : )
       @galleries_list = Gallery.all.list
-      @locations_list = ::Gameui::Map.list
       @maps_list = ::Gameui::Map.list # @TODO: missing nonpublic!
       @reports_list = Report.all.list
-      @tags_list = Tag.list
       @user_profiles_list = Ish::UserProfile.list
       @videos_list = Video.all.list
     end
@@ -63,10 +49,11 @@ module IshManager
       puts a.inspect
     end
 
+    # @TODO: obsolete, remove _vp_ 2022-10-15
     def update_profile_pic
       return unless params[:photo]
       @photo = Photo.new :photo => params[:photo]
-      @photo.user_profile = @current_user.profile
+      @photo.user_profile = @current_profile
       flag = @photo.save
       @resource.profile_photo = @photo
       flagg = @resource.save

data/app/controllers/ish_manager/{unsubscribes_controller.rb → email_unsubscribes_controller.rb}

@@ -1,5 +1,5 @@
 
-class ::IshManager::UnsubscribesController < IshManager::ApplicationController
+class ::IshManager::EmailUnsubscribesController < IshManager::ApplicationController
 
   layout false
 

data/app/controllers/ish_manager/galleries_controller.rb

@@ -38,6 +38,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def index
     authorize! :index, Gallery
+    @page_title = 'Galleries'
     @galleries = Gallery.unscoped.where( ## This must be so for role `guy`. _vp_ 2022-10-03
       :is_done.in => [false, nil],
       :is_trash.in => [false, nil],
@@ -70,11 +71,13 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def new
     @gallery = Gallery.new
+    @page_title = 'New Gallery'
     authorize! :new, @gallery
   end
 
   def shared_with_me
     authorize! :index, Gallery
+    @page_title = 'Galleries Shared With Me'
     @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
       ).order_by( :created_at => :desc
       ).page( params[:shared_galleries_page] ).per( 10 )
@@ -118,6 +121,8 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     rescue
       @gallery = Gallery.unscoped.find params[:id]
     end
+    @page_title = "#{@gallery.name} Gallery"
+    @page_description = @gallery.subhead
   end
 
 end

data/app/controllers/ish_manager/photos_controller.rb

@@ -5,9 +5,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
   skip_authorization_check :only => [ :j_create ]
   protect_from_forgery :except => [ :j_create]
 
-  def without_gallery
-    @photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
-  end
+  ## Alphabetized : )
 
   def destroy
     @photo = Photo.unscoped.find params[:id]
@@ -23,9 +21,9 @@ class IshManager::PhotosController < IshManager::ApplicationController
     redirect_to request.referrer || root_path
   end
 
-  def show
-    @photo = Photo.unscoped.find params[:id]
-    authorize! :show, @photo
+  def index
+    authorize! :index, Photo
+    @photos = Photo.all.page( params[:photos_page] )
   end
 
   def j_create
@@ -63,5 +61,19 @@ class IshManager::PhotosController < IshManager::ApplicationController
     end
   end
 
+  def new
+    authorize! :new, Photo
+    @photo = Photo.new
+  end
+
+  def show
+    @photo = Photo.unscoped.find params[:id]
+    authorize! :show, @photo
+  end
+
+  def without_gallery
+    @photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
+  end
+
 end
 

data/app/controllers/ish_manager/videos_controller.rb

@@ -7,7 +7,7 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   def create
     @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
-      tags site user_profile premium_tier premium_purchases thumb video |)
+      site user_profile premium_tier premium_purchases thumb video |)
     @video.user_profile = current_user.profile
     if !params[:video][:site_id].blank?
       @video.site = Site.find params[:video][:site_id]

data/app/mailers/ish_manager/application_mailer.rb

@@ -25,10 +25,5 @@ module IshManager
       mail( :to => stock.profile.email, :subject => "IshManager Stock Alert :: #{stock.ticker}" ).deliver
     end
 
-    def test_email s=''
-      puts! s, "#test_email - delivering"
-      mail( to: 'piousbox@gmail.com', subject: "Test #{s} :: #{DateTime.now.strftime("%Y-%m-%d %l:%M:%S %P")}" )
-    end
-
   end
 end

data/app/models/ish_manager/ability.rb

@@ -2,17 +2,17 @@
 class IshManager::Ability
   include ::CanCan::Ability
 
-  def initialize user
+  def initialize user_profile
 
     #
     # signed in user
     #
-    if !user.blank?
+    if !user_profile.blank?
 
       #
       # only sudoer... total power
       #
-      if user.profile && user.profile.sudoer?
+      if user_profile.sudoer?
         can :manage, :all
       end
 
@@ -21,13 +21,13 @@ class IshManager::Ability
       #
       # role admin
       #
-      if user.profile && [ :admin ].include?( user.profile.role_name )
+      if user_profile && [ :admin ].include?( user_profile.role_name )
 
         can [ :friends_index, :friends_new ], ::Ish::UserProfile
 
         can [ :index, :new, :create, :create_photo ], ::Gallery
         can [ :edit, :update ], ::Gallery do |g|
-          !g.is_trash && ( g.is_public || g.user_profile == user.profile )
+          !g.is_trash && ( g.is_public || g.user_profile == user_profile )
         end
         can [ :edit, :index, :show, :update,
           :new_marker, :edit_marker, :create_marker, :update_marker,
@@ -39,7 +39,7 @@ class IshManager::Ability
 
         can [ :index, :new, :create ], Report
         can [ :edit, :update, :destroy ], Report do |g|
-          !g.is_trash && ( g.is_public || g.user_profile == user.profile )
+          !g.is_trash && ( g.is_public || g.user_profile == user_profile )
         end
 
         # can [ :manage ], ::Warbler::StockWatch
@@ -48,7 +48,7 @@ class IshManager::Ability
 
         can [ :index, :new, :create ], ::Video
         can [ :edit, :update, :destroy ], ::Video do |v|
-          !v.is_trash && ( v.is_public || v.user_profile == user.profile )
+          !v.is_trash && ( v.is_public || v.user_profile == user_profile )
         end
 
       end
@@ -56,7 +56,7 @@ class IshManager::Ability
       #
       # role manager
       #
-      if user.profile && :manager == user.profile.role_name
+      if user_profile && :manager == user_profile.role_name
 
          can [ :edit, :index, :show, :update,
                :new_marker, :edit_marker, :create_marker, :update_marker,
@@ -68,14 +68,14 @@ class IshManager::Ability
       #
       # role guy (and manager)
       #
-      if user.profile && [ :manager, :guy ].include?( user.profile.role_name )
+      if user_profile && [ :manager, :guy ].include?( user_profile.role_name )
 
         can [ :index, :new, :create ], ::Gallery
         can [ :show, :edit, :update, :create_photo ], ::Gallery do |gallery|
-          gallery.user_profile == user.profile
+          gallery.user_profile == user_profile
         end
         can [ :show ], ::Gallery do |gallery|
-          gallery.shared_profiles.include? user.profile
+          gallery.shared_profiles.include? user_profile
         end
 
         # can [ :index ], ::Report
@@ -89,7 +89,7 @@ class IshManager::Ability
     #
     # anonymous user
     #
-    user ||= ::User.new
+    user_profile ||= ::Ish::UserProfile.new
 
     can [ :open_permission ], IshManager::Ability
 
@@ -101,7 +101,7 @@ class IshManager::Ability
       report.is_public
     end
 
-    can [ :new, :create ], Ish::Unsubscribe
+    can [ :new, :create ], Ish::EmailUnsubscribe
 
   end
 end

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

@@ -6,13 +6,9 @@
     .a
       .row
         .col-sm-6
-          - if @current_user
-            %ul
-              %li <b>Email:</b> #{@current_user.email}
-              %li <b>Role name:</b> #{@current_user.profile&.role_name}
-          - else
-            Please log in
-            = link_to '[+]', main_app.new_user_session_path
+          %ul
+            %li <b>Email:</b> #{@current_profile.email}
+            %li <b>Role name:</b> #{@current_profile.role_name}
 
         .col-sm-4
           \~__^

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

@@ -23,3 +23,4 @@
             = text_field_tag :q
         = link_to '[+]', new_video_path
     .c
+  %hr

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

@@ -1,6 +1,6 @@
 
 .application-home
-  Welcome home! Your role is `#{current_user.profile.role_name}`.
+  Welcome home
 
   .bordered-card
     = form_tag "https://www.cgtrader.com/free-3d-models", method: :get do

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

@@ -1,6 +1,7 @@
 
 .galleries--title
   %h2
+    Gallery
     = link_to gallery.name, gallery_path(gallery)
     (#{gallery.photos.length})
     = link_to '[~]', edit_gallery_path( gallery )
@@ -9,5 +10,7 @@
       %i.material-icons visibility
     - else
       %i.material-icons visibility_off
-  slug :: #{gallery.slug}
-  = render 'meta', :item => gallery
+  %ul
+    %li slug :: #{gallery.slug}
+    %li subhead :: #{gallery.subhead}
+    %li= render 'meta', :item => gallery

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

@@ -3,26 +3,28 @@
 -#
 
 .galleries-show
-  = render 'title', :gallery => @gallery
+  .row
+    .col-sm-12.col-md-6
+      = render 'title', :gallery => @gallery
+    .col-sm-12.col-md-6
+      = render 'ish_manager/photos/multinew', :gallery => @gallery
 
-  = render 'ish_manager/photos/multinew', :gallery => @gallery
-
-  .row.row-deleted
+  .row-deleted
     %p.collapse-expand#rowDeleted Deleted
     = render 'ish_manager/photos/index_thumbs', photos: @deleted_photos
 
-  .row.row-mini
+  .row-mini
     %p.collapse-expand#rowMinis Mini's
     .flex-row
       - @photos.each do |photo|
         .item
           = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
 
-  .row.row-thumbs
+  .row-thumbs
     %p.collapse-expand#rowThumbs Thumbs
     = render 'ish_manager/photos/index_thumbs', photos: @photos
 
-  .row.row-large
+  .row-large
     %p.collapse-expand#rowLarge Large
     .a
       - @photos.each do |photo|

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

@@ -0,0 +1,3 @@
+
+= render 'index_thumbs', photos: @photos
+

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

@@ -1,9 +1,6 @@
 
 -# ish_manager / reports / index
 
-- if @site
-  = render 'ish_manager/sites/header', :site => @site
-
 .row
   .large-12.columns
     %h3
@@ -24,10 +21,6 @@
           = link_to report.name, report_path( report )
           %br
           .gray
-            - if report.site
-              Site <b>#{report.site.domain}/#{report.site.lang}</b>
-            - if report.city
-              City <b>#{report.city.name}</b>
             = pp_date report.created_at
           - if report.photo
             = image_tag report.photo.photo.url :thumb

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

@@ -38,10 +38,6 @@
         = f.label :fb_long_access_token
         = f.text_field :fb_long_access_token
 
-      .input-field
-        = f.select :bookmarked_location_ids, options_for_select( @locations_list, selected: profile.bookmarked_location_ids), {}, { multiple: true }
-        %label Bookmarked Locations
-
       = f.submit 'Save', :class => %w(button)
 
 

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

@@ -1,11 +1,11 @@
 !!!
 %html
   %head
-    %title Ish Manager
+    %title #{@page_title} | PiousboxCMS
     %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' }
+    %meta{ :description => @page_description }
 
     = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
 
@@ -31,11 +31,11 @@
     = 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
+      = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
+      .container.W0
         - if notice || alert
           .row
-            .col.s12
+            .col-sm-12
               - if notice
                 - if notice.class == Array
                   %ul

data/config/routes.rb

@@ -1,25 +1,8 @@
 
 IshManager::Engine.routes.draw do
 
-  post 'email_test', to: 'application#email_test', as: :email_test
-
   root :to => 'application#home'
 
-  ## @deprecated: use Locations
-  resources :cities do
-    resources :features
-    resources :newsitems
-    resources :reports
-    resources :galleries
-    resources :videos
-    resources :events
-    resources :venues
-    resources :tags
-  end
-  resources :events
-
-  resources :friends
-
   get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
   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 }
@@ -61,11 +44,7 @@ IshManager::Engine.routes.draw do
   #
   # office, below
   #
-  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }, as: :leads
-  get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
-  resources :leads
 
-  resources :meetings
   resources :email_campaigns, as: :email_campaigns
 
   get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
@@ -77,13 +56,13 @@ IshManager::Engine.routes.draw do
   get 'email_templates/show/:id', to: 'email_templates#show', as: :email_template
   delete 'email_templates/show/:id', to: 'email_templates#destroy'
   resources :email_templates
+  resources :email_unsubscribes
 
-  resources :unsubscribes
-  resources :sent_emails
-  #
-  # office, above
-  #
+  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }, as: :leads
+  get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
+  resources :leads
 
+  resources :meetings
 
   resources :newsitems
 
@@ -92,31 +71,6 @@ IshManager::Engine.routes.draw do
 
   resources :reports
 
-  ## @deprecated: use Locations
-  resources :sites do
-    resources :features
-    resources :newsitems
-
-    get 'reports', :to => 'sites#reports'
-    resources :reports
-
-    get 'galleries', :to => 'sites#galleries'
-
-    resources :galleries
-    resources :videos
-    resources :tags
-  end
-
-  resources :tags do
-    resources :features
-    resources :newsitems
-
-    resources :reports
-    resources :galleries
-    resources :videos
-  end
-
-  resources :users
   resources :user_profiles do
     resources :newsitems
   end
@@ -124,9 +78,6 @@ IshManager::Engine.routes.draw do
     # resources :newsitems
   end
 
-  ## @TODO: venues can only be in cities, right?
-  ## @deprecated: use Locations
-  resources :venues
   resources :videos
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.320
+  version: 0.1.8.321
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -204,8 +204,8 @@ files:
 - app/assets/images/bg/confectionary.png
 - app/assets/images/bg/gplaypattern.png
 - app/assets/images/bg/triangular.png
-- app/assets/images/bg/weather-development.png
-- app/assets/images/bg/weather.png
+- app/assets/images/bg/weather-bg-development.png
+- app/assets/images/bg/weather-bg.png
 - app/assets/images/favicon.gif
 - app/assets/images/icons/10x10_red-cross.png
 - app/assets/images/icons/20x20/private.png
@@ -259,7 +259,6 @@ files:
 - app/assets/stylesheets/ish_manager/markers.scss
 - app/assets/stylesheets/ish_manager/pagination.scss
 - app/assets/stylesheets/ish_manager/photos.scss
-- app/assets/stylesheets/ish_manager/tags.scss
 - app/assets/stylesheets/ish_manager/trash/bootstrap.css
 - app/assets/stylesheets/ish_manager/trash/materialize.css
 - app/assets/stylesheets/ish_manager/trash/reset.css
@@ -269,6 +268,7 @@ files:
 - app/controllers/ish_manager/email_campaigns_controller.rb
 - app/controllers/ish_manager/email_contexts_controller.rb
 - app/controllers/ish_manager/email_templates_controller.rb
+- app/controllers/ish_manager/email_unsubscribes_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/image_assets_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
@@ -280,14 +280,13 @@ 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/tags_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/unsubscribes_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
-- app/controllers/ish_manager/users_controller.rb
 - app/controllers/ish_manager/videos_controller.rb
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
@@ -297,20 +296,19 @@ files:
 - app/mailers/ish_manager/meeting_mailer.rb
 - app/mailers/ish_manager/office_mailer.rb
 - app/models/ish_manager/ability.rb
-- app/models/ish_manager/application_record.rb
 - app/views/ish_manager/application/_analytics.html
 - app/views/ish_manager/application/_debug.haml
 - app/views/ish_manager/application/_form_errors.haml
 - app/views/ish_manager/application/_form_nonpublic.haml
 - 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_guy.haml
-- app/views/ish_manager/application/_main_header_manager.haml
 - app/views/ish_manager/application/_meta.haml
 - app/views/ish_manager/application/_profile_pic.haml
 - app/views/ish_manager/application/_search.haml
 - app/views/ish_manager/application/home.haml
+- app/views/ish_manager/application/trash/_main_header.haml
+- app/views/ish_manager/application/trash/_main_header_manager.haml
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
 - app/views/ish_manager/application_mailer/welcome.html.erb
 - app/views/ish_manager/email_campaigns/index.haml
@@ -397,10 +395,13 @@ files:
 - app/views/ish_manager/office_mailer/render
 - app/views/ish_manager/office_mailer/test_email.html.haml
 - app/views/ish_manager/payments/index.haml
+- app/views/ish_manager/photos/_form.haml
 - app/views/ish_manager/photos/_index_thumbs.haml
 - app/views/ish_manager/photos/_meta.haml
 - app/views/ish_manager/photos/_meta_manager.haml
 - app/views/ish_manager/photos/_multinew.haml
+- app/views/ish_manager/photos/index.haml
+- app/views/ish_manager/photos/new.haml
 - app/views/ish_manager/photos/show.haml
 - app/views/ish_manager/photos/without_gallery.haml
 - app/views/ish_manager/reports/_form.haml
@@ -479,14 +480,13 @@ files:
 - app/views/layouts/ish_manager/application.haml
 - app/views/layouts/ish_manager/application.haml-trash
 - 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/stockwatcher.service
+- lib/systemd/system/watch_stocks.service
+- lib/tasks/done/migrate.rake
 - lib/tasks/ish_manager_tasks.rake
-- lib/tasks/migrate.rake
 homepage: http://wasya.co
 licenses:
 - MIT

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

@@ -1,7 +0,0 @@
-
-/**
- * tags
- */
-ul.tags ul.tags {
-  margin-left: 2em;
-}

data/app/models/ish_manager/application_record.rb

@@ -1,7 +0,0 @@
-=begin
-module IshManager
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end
-=end

data/config/systemd/system/README.txt

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