ish_manager 0.1.8.68 → 0.1.8.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34d7fa5481c945dcea114517980dc723b6da541d
-  data.tar.gz: a349579cf5062c021692987174a0223d8d548478
+  metadata.gz: ba39cadec19bfb3e61b3056ad802e03285ff93c9
+  data.tar.gz: 60121629ee55411fcf65c061d676a43d553f6d88
 SHA512:
-  metadata.gz: 1be467ab30b2c35069a4f658ba4fcb37317e859c52d3e61bb53a72ac747c9e7416b9f27bf3f0ee7514f0ab6d5523672bcf90d0ceca09d4fd909bda20f9a97b9a
-  data.tar.gz: 2dfad7cd8ac07d81e28ac1c76ed035e529811c0aba80215a8e4b2c865b5da11b9c3273773896316fe4e534b65340e60b6d8db63f3aec8899fba028955c4a0739
+  metadata.gz: fce67a4a32ec81691072f17852010e302659ac7acf8a4832a3efe420d68343ef6e2dc3387660df32709b1bccb35dc96baa93f6318365e5d2ac75de6dcdd03419
+  data.tar.gz: d5a2b4f3c847a3082c55cb466345b1c61b2399e24c45921c73e5f33fd86e03ecca627782549fb9c6ae22154d8ab2409f099277fdc8148605000f944df469b90d

data/README.md

@@ -1,5 +1,8 @@
 
-# Test
 
+# Test
  cd test/dummy && be rspec spec/controllers
 
+# Deploy
+ be rake app:migrate
+

data/Rakefile

@@ -1,3 +1,4 @@
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -17,23 +18,24 @@ end
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
 require 'bundler/gem_tasks'
 
+=begin
 require 'rake/testtask'
-
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
+=end
 
+=begin
 require 'rspec/core/rake_task'
-
 RSpec::Core::RakeTask.new( :spec ) do |task|
   task.pattern = "spec/controllers/ish_manager/galleries_controller_spec.rb"
 end
+=end
 
-task :default => :spec
+# task :default => :spec

data/app/assets/javascripts/ish_manager/application.js

@@ -41,11 +41,53 @@ $(document).ready(function () {
     });
   }
   
-  $('select').material_select();
+  $('select').material_select()
 
   $(".caret").each(function(idx) {
-    $($(".caret")[idx]).html('');
-  });
+    $($(".caret")[idx]).html('')
+  })
+
+  var mainHeaderContext = $(".manager--main-header")
+  $(".manager--main-header #collapseHeader").click(function (_e) {
+    if ($(this).hasClass('fa-compress')) {
+      $(this).addClass('fa-expand')
+      $(this).removeClass('fa-compress')
+      localStorage.setItem('mainHeaderCollapsed', 'true')
+      $('.content', $(this).parent()).css('display', 'none')
+    } else {
+      $(this).removeClass('fa-expand')
+      $(this).addClass('fa-compress')
+      localStorage.setItem('mainHeaderCollapsed', 'false')
+      $('.content', $(this).parent()).css('display', 'block')
+    }    
+  })
+  if (localStorage.getItem('mainHeaderCollapsed') === 'true') {
+    console.log('here')
+    $("#collapseHeader").addClass('fa-expand')
+    $("#collapseHeader").removeClass('fa-compress')
+    $(".content", mainHeaderContext).css("display", 'none')
+  }
+
+  var mainFooterContext = $(".manager--main-footer")
+  $(".manager--main-footer #collapseFooter").click(function (_e) {
+    if ($(this).hasClass('fa-compress')) {
+      $(this).addClass('fa-expand')
+      $(this).removeClass('fa-compress')
+      localStorage.setItem('mainFooterCollapsed', 'true')
+      $('.content', $(this).parent()).css('display', 'none')
+    } else {
+      $(this).removeClass('fa-expand')
+      $(this).addClass('fa-compress')
+      localStorage.setItem('mainFooterCollapsed', 'false')
+      $('.content', $(this).parent()).css('display', 'block')
+    }    
+  })
+  if (localStorage.getItem('mainFooterCollapsed') === 'true') {
+    console.log('here')
+    $("#collapseFooter").addClass('fa-expand')
+    $("#collapseFooter").removeClass('fa-compress')
+    $(".content", mainFooterContext).css("display", 'none')
+  }
 
 });
  

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

@@ -77,13 +77,20 @@ hr {
   padding: .5em;
 }
 
+.collapse-expand {
+  cursor: pointer;
+}
+
 /**
- * manager... wut?
+ * manager... 
  */
 
 .manager--main-header {
   background: url('/assets/bg/weather.png');
 }
+.manager--main-header hr {
+  margin-top: 0;
+}
 
 .manager-galleries--index .mini {
   float: left;

data/app/controllers/ish_manager/application_controller.rb

@@ -1,11 +1,11 @@
 module IshManager
   class ApplicationController < ActionController::Base
-    protect_from_forgery :with => :exception
+    protect_from_forgery :with => :null_session, :prepend => true
     before_action :set_current_ability
     check_authorization
 
     def home
-      authorize! :home, Manager
+      authorize! :home, IshManager::Ability
       render 'home'
     end
 

data/app/controllers/ish_manager/friends_controller.rb

@@ -0,0 +1,23 @@
+class IshManager::FriendsController < IshManager::ApplicationController
+
+  def index
+    authorize! :friends_index, IshModels::UserProfile
+    @new_friend = IshModels::UserProfile.new
+  end
+
+  def create
+    @friend = IshModels::UserProfile.find_by :email => params[:friend][:email]
+    authorize! :friends_new, @friend
+    me = current_user.profile
+    me.friends << @friend
+    if me.save
+      flash[:notice] = 'Added Friend'
+    else
+      flash[:alert] = "Cannot add friend: #{me.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+end
+
+

data/app/controllers/ish_manager/galleries_controller.rb

@@ -4,9 +4,10 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   
   def index
     authorize! :index, Gallery
-    @galleries = Gallery.unscoped.where( :is_trash => false
+    @galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
                                        ).order_by( :created_at => :desc 
                                                  ).page( params[:galleries_page] ).per( 10 )
+    @shared_galleries = current_user.profile.shared_galleries.page( params[:shared_galleries_page] ).per( 10 )
   end
 
   def index_thumb
@@ -29,11 +30,15 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   end
 
   def create
+    params[:gallery][:shared_profiles].delete('')
+    params[:gallery][:shared_profiles] = IshModels::UserProfile.find params[:gallery][:shared_profiles]
     @gallery = Gallery.new params[:gallery].permit!
+    @gallery.user_profile = current_user.profile
+    @gallery.username = current_user.profile.username
     authorize! :create, @gallery
-    # @gallery.username = current_user.profile.username
 
     if @gallery.save
+      GalleriesNotifier.shared_galleries( params[:gallery][:shared_profiles] ).deliver
       flash[:notice] = 'Success'
       redirect_to galleries_path
     else
@@ -51,12 +56,17 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def update
     @gallery = Gallery.unscoped.find params[:id]
+    old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
+    params[:gallery][:shared_profiles].delete('')
+    params[:gallery][:shared_profiles] = IshModels::UserProfile.find params[:gallery][:shared_profiles]
     if @gallery.update_attributes( params[:gallery].permit! )
+      new_shared_profiles = params[:gallery][:shared_profiles].select { |p| !old_shared_profile_ids.include?( p.id ) }
+      IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
       flash[:notice] = 'Success.'
       redirect_to galleries_path
     else
-      flash[:error] = 'No Luck. ' + @gallery.errors.messages
+      flash[:error] = 'No Luck. ' + @gallery.errors.messages.to_s
       render :action => :edit
     end
   end                           

data/app/controllers/ish_manager/leads_controller.rb

@@ -0,0 +1,39 @@
+class IshManager::LeadsController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Ish::Lead
+    @leads = Ish::Lead.where( :profile => current_user.profile )
+  end
+
+  def new
+    @new_lead = Ish::Lead.new
+    authorize! :new, @new_lead
+  end
+
+  def create
+    @lead = Ish::Lead.new params[:lead].permit!
+    @lead.profile = current_user.profile
+    authorize! :create, @lead
+    if @lead.save
+      flash[:notice] = "created lead"
+    else
+      flash[:alert] = "Cannot create lead: #{@lead.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+=begin
+  def update
+    @invoice = Ish::Invoice.find params[:id]
+    authorize! :update, @invoice
+    if @invoice.update_attributes params[:invoice].permit!
+      flash[:notice] = 'Success'
+      redirect_to :action => 'index'
+    else
+      flash[:alert] = "Cannot update invoice: #{@invoice.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+=end
+
+end

data/app/controllers/ish_manager/photos_controller.rb

@@ -24,10 +24,6 @@ class IshManager::PhotosController < IshManager::ApplicationController
   end
 
   def j_create
-    @photo = Photo.new params[:photo].permit!
-    authorize! :create, @photo
-    @photo.is_public = true
-   
     # find this gallery
     if params[:galleryname]
       gallery = Gallery.unscoped.where( :galleryname => params[:galleryname] ).first
@@ -36,6 +32,10 @@ class IshManager::PhotosController < IshManager::ApplicationController
       gallery = Gallery.unscoped.find( params[:gallery_id] )
       gallery ||= Gallery.unscoped.where( :galleryname => params[:gallery_id] ).first
     end
+    authorize! :create_photo, gallery
+
+    @photo = Photo.new params[:photo].permit!
+    @photo.is_public = true   
     @photo.gallery = gallery
     
     # cache

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -12,6 +12,8 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   end
 
   def edit
+    puts! current_user, 'herehere'
+
     @profile = IshModels::UserProfile.find params[:id]
     authorize! :edit, @profile
   end
@@ -19,7 +21,7 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
   def update
     @profile = IshModels::UserProfile.find params[:id]
     authorize! :update, @profile
-    flag = @profile.update_attributes params[:ish_models_user_profile].permit!
+    flag = @profile.update_attributes params[:profile].permit!
     if flag
       flash[:notice] = "Updated profile #{@profile.email}"
     else

data/app/mailers/ish_manager/application_mailer.rb

@@ -14,5 +14,15 @@ module IshManager
       mail( :to => stock.profile.email, :subject => 'IshManager Stock Alert' ).deliver
     end
 
+    def shared_galleries profiles, gallery
+      @gallery        = gallery
+      @domain         = Rails.application.config.action_mailer.default_url_options[:host]
+      @galleries_path = IshManager::Engine.routes.url_helpers.galleries_path
+      @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery)
+      mail( :to => 'victor@wasya.co',
+            :bcc => profiles.map { |p| p.email },
+            :subject => 'You got new shared galleries on pi manager' ).deliver
+    end
+
   end
 end

data/app/models/ish_manager/ability.rb

@@ -9,7 +9,18 @@ class IshManager::Ability
     #
     unless user.blank?
 
+      can [ :index, :new, :create ], ::Gallery
+      can [ :show, :edit, :update, :create_photo ], ::Gallery do |gallery|
+        gallery.user_profile == user.profile
+      end
+      
+      can [ :home ], IshManager::Ability
+      
+      can [ :friends_index, :friends_new ], IshModels::UserProfile
+
+      #
       # role manager
+      #
       if user.profile && [ :manager, :admin ].include?( user.profile.role_name )    
 
         can [ :create_newsitem, :show, :new_feature, :create_feature ], ::City
@@ -32,16 +43,13 @@ class IshManager::Ability
       end
 
       if user.profile && user.profile.sudoer?
-        can :manage, :all # HEREHERE
+        can :manage, :all # @TODO: this is important
         can [ :manage ], ::Gallery
         can [ :manage ], ::Gallery2
         can [ :home ], ::Manager
         can :destroy, ::Photo
       end
 
-      can [ :show ], ::Gallery do |gallery|
-        gallery.user == user
-      end
       
     end
     #

data/app/views/ish_manager/application/_analytics.html

@@ -0,0 +1,9 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-53077236-7"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-53077236-7'); // manager.piousbox.com, _vp_ 20171203
+</script>

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

@@ -1,24 +1,26 @@
 
-.container
-  %br
-  .row
-    .col-sm-5
-      - if defined?( current_user ) && current_user
-        %ul
-          %li >[ #{current_user.email} ]<
-          %li >[ #{current_user.profile.role_name} ]<
-      - else
-        Please log in
-        = link_to '[+]', main_app.new_user_session_path
+.manager--main-footer
+  .container
+    .row
+      %i.fa.fa-compress.collapse-expand#collapseFooter
+      .content
+        .col-sm-5
+          - if defined?( current_user ) && current_user
+            %ul
+              %li >[ #{current_user.email} ]<
+              %li >[ #{current_user.profile.role_name} ]<
+          - else
+            Please log in
+            = link_to '[+]', main_app.new_user_session_path
 
-    .col-sm-5
-      %br
-      \~__^
-      1.5
-      %br
-      %br
-      %br
-      %br
-      %br
-    .col-sm.2
-      = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete
+        .col-sm-5
+          %br
+          \~__^
+          1.6
+          %br
+          %br
+          %br
+          %br
+          %br
+        .col-sm.2
+          = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete

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

@@ -3,25 +3,29 @@
   .container
     .row
       .col-sm-12
-        %br
-        %ul.nav.nav-pills
-          %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
-          %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
-          %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
-          %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
-        %ul.nav.nav-pills          
-          %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
-          %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
-          %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
-          %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
-          %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
-        %ul.nav.nav-pills
-          -# %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
-          %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
-          %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
-          %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
-        %ul.nav.nav-pills
-          %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
-          %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
+        %i.fa.fa-compress.collapse-expand#collapseHeader
+        .content
+          %ul.nav.nav-pills
+            %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
+            %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
+            %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
+            %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
+            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
+          %ul.nav.nav-pills          
+            %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
+            %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
+            %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
+            %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
+            %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
+          %ul.nav.nav-pills
+            -# %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
+            %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
+            %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
+            %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
+          %ul.nav.nav-pills
+            %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
+            %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
+          %ul.nav.nav-pills
+            %li{ :class => params[:controller] == 'ish_manager/leads'         ? 'active' : '' }= link_to 'Leads', leads_path
   %hr
 

data/app/views/ish_manager/application_mailer/shared_galleries.html.erb

@@ -0,0 +1,9 @@
+<html>
+<head>
+</head>
+<body>
+<h1>Hello,</h1>
+<p>This gallery has been newly shared with you on pi manager: <a href="<%="#{@domain}#{@gallery_path}"%>"><%= @gallery.name %></a>.</p>
+<p>Also see all your <a href="<%= "#{@domain}#{@galleries_path}" %>">shared galleries.</a></p>
+</body>
+</html>

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

@@ -0,0 +1,16 @@
+
+%h5 Friends
+
+.panel
+  .panel-body
+    = form_for @new_friend, :as => :friend, :url => friends_path do |f|
+      .row
+        .col-sm-6
+          = f.text_field :email, :placeholder => 'email'
+        .col-sm-6
+          = f.submit 'Add Friend'
+          
+- current_user.profile.friends.each do |friend|
+  .panel
+    .panel-body
+      = friend.email

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

@@ -21,8 +21,8 @@
       = f.label :venue
       = select :gallery, :venue_id, @venues_list
     .col-sm-4
-      = f.label :user_proifle
-      = select :user_profile, :user_profile_id, @user_profiles_list
+      = f.label 'Shared with'
+      = f.select :shared_profiles, options_for_select( [[nil,nil,:disabled=>true]]+current_user.profile.friends.map { |f| [ f.email, f.id ] }, :selected => gallery.shared_profiles.map(&:id) ), {}, { :multiple => true }
       
   .row
     .col-sm-3

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

@@ -1,5 +1,6 @@
 
-- n_thumbs ||= 9
+- n_thumbs   ||= 9
+- param_name ||= :galleries_page
 
 - if galleries.length > 0
   .galleries--list
@@ -16,7 +17,7 @@
             = link_to image_tag(photo.photo.url(:thumb), :alt => g.name, :class => :thumb ), gallery_path(g.galleryname)
     .c
 
-    = paginate galleries, :param_name => :galleries_page
+    = paginate galleries, :param_name => param_name
     
 - else
   %h5 No Galleries

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

@@ -9,10 +9,16 @@
   .row
     .col-sm-6
       %h4
-        Galleries (#{@galleries.count})
+        My Galleries (#{@galleries.count})
         = link_to '[+]', new_gallery_path
     .col-sm-6= render 'search'
   .row
     .col-sm-12
       -# = render 'ish_manager/galleries/menu_secondary'
-      = render 'ish_manager/galleries/list', :galleries => @galleries
+      = render 'ish_manager/galleries/list', :galleries => @galleries, :param_name => :galleries_page
+
+.container
+  .row
+    .col-sm-12
+      %h4 Shared with me
+      = render 'ish_manager/galleries/list', :galleries => @shared_galleries, :param_name => :shared_galleries_page

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

@@ -0,0 +1,19 @@
+
+- url = lead.persisted? ? lead_path( lead.id ) : leads_path
+
+= form_for lead, :as => :lead, :url => url do |f|
+  .input-field
+    = f.label :email
+    = f.text_field :email
+  .input-field
+    = f.label :job_url
+    = f.text_field :job_url
+  .input-field
+    = f.label :company
+    = f.text_field :company
+  .input-field
+    = f.label :description
+    = f.text_area :description
+  .actions
+    = f.submit
+  

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

@@ -0,0 +1,18 @@
+
+.manager--leads-index
+  %h5
+    Leads (#{@leads.count})
+    = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
+  
+  %table
+    %tr
+      %th Company
+      %th Email
+      %th Job Url
+      %th Description
+    - @leads.each do |lead|
+      %tr
+        %td= lead.company
+        %td= lead.email
+        %td= link_to lead.job_url, lead.job_url, :target => '_blank'
+        %td= lead.description

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

@@ -0,0 +1,5 @@
+
+.row
+  .col-sm-6.col-sm-offset-3
+    %h5 New Lead
+    = render 'form', :lead => @new_lead

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

@@ -1,3 +1,4 @@
+%p Creates user if one doesn't exist for the profile (or uses existing for wiring).
 
 .row
   .col-xs-12.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3

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

@@ -9,6 +9,7 @@
     %script{ :src => "https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
     %script{ :src => "https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
     %script{ :src => "https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
+    = stylesheet_link_tag "https://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 "//fonts.googleapis.com/icon?family=Material+Icons"
@@ -27,4 +28,5 @@
               %p.alert= alert
       .container
         = yield
-    = render :partial => 'ish_manager/application/main_footer'
+    = render 'ish_manager/application/main_footer'
+    = render 'analytics' unless Rails.env.development?

data/config/routes.rb

@@ -12,9 +12,11 @@ IshManager::Engine.routes.draw do
     resources :venues
   end
 
+  resources :email_templates
   resources :events
 
-  resources :features
+  resources :feature
+  resources :friends
 
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
@@ -24,6 +26,8 @@ IshManager::Engine.routes.draw do
     resources :payments
   end
 
+  resources :leads
+
   resources :newsitems
 
   resources :photos

data/lib/tasks/migrate.rake

@@ -0,0 +1,19 @@
+
+def puts! a, b=""
+  puts "+++ +++ #{b}"
+  puts a.inspect
+end
+
+task :migrate => [ 'migrate:assign_galleries_to_profile' ]
+
+namespace :migrate do
+
+  desc 'assign galleries to profile'
+  task :assign_galleries_to_profile => :environment do
+    u = User.find_by :email => 'piousbox@gmail.com'
+    Gallery.unscoped.where( :user_profile => nil ).update_all( :user_profile_id => u.profile.id )
+    puts 'Each gallery is associated with a user profile.'
+  end
+
+end
+  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.68
+  version: 0.1.8.69
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,9 +156,11 @@ files:
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
 - app/controllers/ish_manager/features_controller.rb
+- app/controllers/ish_manager/friends_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb~
 - app/controllers/ish_manager/invoices_controller.rb
+- app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
@@ -181,6 +183,7 @@ files:
 - app/models/ish_manager/ability.rb~
 - app/models/ish_manager/application_record.rb
 - app/views/ish_manager/ally/home.haml
+- app/views/ish_manager/application/_analytics.html
 - app/views/ish_manager/application/_form_errors.haml
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
@@ -188,6 +191,7 @@ files:
 - app/views/ish_manager/application/_meta.haml
 - app/views/ish_manager/application/_meta.haml~
 - app/views/ish_manager/application/home.haml
+- app/views/ish_manager/application_mailer/shared_galleries.html.erb
 - app/views/ish_manager/application_mailer/stock_alert.html.erb
 - app/views/ish_manager/application_mailer/welcome.html.erb
 - app/views/ish_manager/cities/_form.haml
@@ -209,6 +213,7 @@ files:
 - 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/friends/index.haml
 - app/views/ish_manager/galleries/_form.haml
 - app/views/ish_manager/galleries/_index.haml
 - app/views/ish_manager/galleries/_list.haml
@@ -253,6 +258,9 @@ files:
 - app/views/ish_manager/kaminari/_paginator.html.erb~
 - app/views/ish_manager/kaminari/_prev_page.html.erb
 - app/views/ish_manager/kaminari/_prev_page.html.erb~
+- app/views/ish_manager/leads/_form.haml
+- app/views/ish_manager/leads/index.haml
+- app/views/ish_manager/leads/new.haml
 - app/views/ish_manager/newsitems/_form.haml
 - app/views/ish_manager/newsitems/_form.haml~
 - app/views/ish_manager/newsitems/_index.haml
@@ -338,6 +346,7 @@ files:
 - lib/ish_manager/version.rb
 - lib/systemd/system/watch_stocks.service
 - lib/tasks/ish_manager_tasks.rake
+- lib/tasks/migrate.rake
 homepage: http://wasya.co
 licenses:
 - MIT