ish_manager 0.1.8.137 → 0.1.8.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da6e407376e4d302636f4980f3363401df2c4dd4
-  data.tar.gz: d7b2a0820e5039cb5fbc12e1d32fd31339dce962
+  metadata.gz: 188ebae7d0e28154da38ff294602e8d2ee61a075
+  data.tar.gz: 1e08caf4790cdbfaad09eb6e572499146d914d4f
 SHA512:
-  metadata.gz: bc6b59e9a3ea794dbaaca9bd8b5557334e091f07059b53e517fc9cf55364c1eefa5802f497e8d611ce2cb5c366e7ea2977a185bb0430ca96b455c5ea1daf4ae6
-  data.tar.gz: 415c0098d9533583d5eab1ea8cd04c431151c62294204eb8424e501b42c721bf2f2d35e66a3790dbd4fca8ff823007f6aaa928149dc544dbb1234f03588d9b77
+  metadata.gz: 70b03ec661311d85f510503bef579f46ec38b2f8d6f9d7f602aa0f56da6bf037133a7bdfc02793c8ec274c4f4a96e952fa0f11fbf412b213de821390512f8fb0
+  data.tar.gz: b9389dc325ee5ffde16e6a1a9aa7ec0c3531dc0c246f94f63c0643d69cd885302220ac0c5d65af617a274dd3b98f9ddc941628a8245cd6d4ef6bd597f8677796

data/app/controllers/ish_manager/campaigns_controller.rb

@@ -0,0 +1,52 @@
+
+class IshManager::CampaignsController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Ish::Campaign
+    @campaigns = Ish::Campaign.where( :profile => current_user.profile, :is_trash => false )
+    if params[:is_done]
+      @campaigns = @campaigns.where( :is_done => true )
+    else
+      @campaigns = @campaigns.where( :is_done => false )
+    end
+  end
+
+  def new
+    @new_campaign = Ish::Campaign.new
+    authorize! :new, @new_campaign
+  end
+
+  def create
+    @campaign = Ish::Campaign.new params[:campaign].permit!
+    @campaign.profile = current_user.profile
+    authorize! :create, @campaign
+    if @campaign.save
+      flash[:notice] = "created campaign"
+    else
+      flash[:alert] = "Cannot create campaign: #{@campaign.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def show
+    authorize! :redirect, IshManager::Ability
+    redirect_to :action => :edit, :id => params[:id]
+  end
+
+  def edit
+    @campaign = Ish::Campaign.find params[:id]
+    authorize! :edit, @campaign
+  end
+
+  def update
+    @campaign = Ish::Campaign.find params[:id]
+    authorize! :update, @campaign
+    if @campaign.update_attributes params[:campaign].permit!
+      flash[:notice] = 'Successfully updated campaign.'
+    else
+      flash[:alert] = "Cannot update campaign: #{@campaign.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+end

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -5,8 +5,9 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def new
     @newsitem = Newsitem.new
-    @sites = Site.list
-    @cities = City.list
+    @sites    = Site.list
+    @cities   = City.list
+    @tags     = Tag.list
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem.city = @city
@@ -15,15 +16,21 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @site = Site.find params[:site_id]
       @newsitem.site = @site
     end
+    if params[:tag_id]
+      @tag = Tag.unscoped.find params[:tag_id]
+      @newsitem.tag = @tag
+    end
     authorize! :new, @newsitem
   end
 
   def create
     @newsitem = Newsitem.new params[:newsitem].permit!
-    @resource = City.find params[:city_id]            if params[:city_id]
+    @resource = City.find params[:city_id] if params[:city_id]
     @resource = City.find params[:newsitem][:city_id] if !params[:newsitem][:city_id].blank?
-    @resource = Site.find params[:site_id]            if params[:site_id]
+    @resource = Site.find params[:site_id] if params[:site_id]
     @resource = Site.find params[:newsitem][:site_id] if !params[:newsitem][:site_id].blank?
+    @resource = Tag.find params[:tag_id] if params[:tag_id]
+    @resource = Tag.find params[:newsitem][:tag_id] if !params[:newsitem][:tag_id].blank?
     @resource.newsitems << @newsitem
 
     authorize! :create_newsitem, @resource
@@ -33,22 +40,26 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem.photo = photo
     end
 
-    flag = @newsitem.save && @resource.save
-    if flag
-      @resource.touch
-    else
-      error = 'No Luck. ' + @newsitem.errors.messages.to_s  + " :: " + photo.errors.messages.to_s
+    case @resource.class.name
+    when "City"
+      url = edit_city_path( @resouce.id )
+    when "Tag"
+      url = tag_path( @resource.id )
+      @resource.site.touch
+    when "Site"
+      url = edit_site_path( @resource.id )
     end
-    url = params[:city_id] ? edit_city_path( @resource.id ) : edit_site_path( @resource.id )
     
+    flag = @newsitem.save && @resource.save
     if flag
+      @resource.touch
       flash[:notice] = 'Success'
       redirect_to url
     else
+      error = 'No Luck. ' + @newsitem.errors.messages.to_s  + " :: " + photo.errors.messages.to_s
       flash[:alert] = error
       @sites = Site.list
       @cities = City.list
-
       render :action => :new
     end
   end
@@ -64,6 +75,11 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       flag = site.newsitems.find( params[:id] ).destroy
       url = edit_site_path( params[:site_id] )
     end
+    if params[:tag_id]
+      tag = Tag.find( params[:tag_id] )
+      flag = tag.newsitems.find( params[:id] ).destroy
+      url = tag_path( params[:tag_id] )
+    end
 
     flash[:notice] = "Success? #{flag}"
     redirect_to url

data/app/controllers/ish_manager/sites_controller.rb

@@ -23,7 +23,7 @@ class IshManager::SitesController < IshManager::ApplicationController
   end
 
   def edit
-    @site = Site.find params[:id]
+    @site = Site.unscoped.find params[:id]
     authorize! :update, @site
   end
   

data/app/controllers/ish_manager/tags_controller.rb

@@ -45,10 +45,10 @@ class IshManager::TagsController < IshManager::ApplicationController
   def update
     @tag = Tag.unscoped.find params[:id]
     authorize! :update, @tag
-    
-    # byebug
 
     if @tag.update_attributes params[:tag].permit!
+      @tag.site.touch if @tag.site
+
       flash[:notice] = 'Success.'
       redirect_to tags_path
     else

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

@@ -27,6 +27,7 @@
             %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
+            %li{ :class => params[:controller] == 'ish_manager/campaigns'     ? 'active' : '' }= link_to 'Campaigns', campaigns_path
           %ul.nav.nav-pills
             %li{ :class => params[:controller] == 'ish_manager/orders'        ? 'active' : '' }= link_to 'Orders', orders_path
   %hr

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

@@ -0,0 +1,24 @@
+
+.manager--campaigns-index
+  %h5
+    = link_to 'Campaigns', campaigns_path
+    (#{@campaigns.count})
+    = link_to raw("<i class='fa fa-plus-square'></i>"), new_campaign_path
+    -# = link_to '(done)', done_campaigns_path
+    
+  %table
+    %tr
+      %th &nbsp;
+      %th Created At
+      %th Company
+      %th Email
+      %th Job Url
+      %th Description
+    - @campaigns.each do |campaign|
+      %tr
+        %td= link_to raw('<i class="fa fa-play"></i>'), campaign_path( campaign )
+        %td= pretty_date campaign.created_at
+        %td= campaign.company
+        %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{campaign.email}"
+        %td= link_to raw('<i class="fa fa-user-md"></i>'), campaign.job_url, :target => '_blank'
+        %td= campaign.description

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

@@ -7,6 +7,10 @@
   - edit_url   = -> (feature) { edit_site_feature_path( site.id, feature.id ) }
   - delete_url = -> (feature) { site_feature_path(      site.id, feature.id ) }
   - new_path   = new_site_feature_path( site.id )
+- if defined? tag
+  - edit_url   = -> (feature) { edit_tag_feature_path( tag.id, feature.id ) }
+  - delete_url = -> (feature) { tag_feature_path(      tag.id, feature.id ) }
+  - new_path   = new_tag_feature_path( tag.id )
   
 .manager-features--index
   %h3

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

@@ -1,16 +1,15 @@
 
 = form_for newsitem, :html => { :multipart => true } do |f|
-  - if @site
-    = hidden_field_tag :site_id, @site.id
-  - elsif @city
-    = hidden_field_tag :city_id, @city.id
-  - else
+  .a
     = f.label :site
-    = f.select :site_id, options_for_select( @sites )
+    = f.select :site_id, options_for_select( @sites, :selected => ( @site ? @site.id : nil ) )
     %br
     = f.label :city
-    = f.select :city_id, options_for_select( @cities )
-  
+    = f.select :city_id, options_for_select( @cities, :selected => ( @city ? @city.id : nil ) )
+    %br
+    = f.label :tag
+    = f.select :tag_id, options_for_select( @tags, (@tag||Tag.new).id )
+
   .a
     = f.label :name
     = f.text_field :name

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

@@ -7,13 +7,17 @@
   - edit_url     = ->(n) { edit_city_newsitem_path( city, n ) }
   - delete_url   = ->(n) { city_newsitem_path( city, n ) }
   - new_newsitem = new_city_newsitem_path( city.id )
-  
+- if defined? tag
+  - edit_url     = ->(n) { edit_tag_newsitem_path( tag, n ) }
+  - delete_url   = ->(n) { tag_newsitem_path( tag, n ) }
+  - new_newsitem = new_tag_newsitem_path( tag.id )
+
 - newsitems = newsitems.page( params[:newsitems_page] ).per( 10 )
 
 .manager-newsitems--index
   .row
     .col-sm-12
-      %h2 Newsitems (#{newsitems.count}) #{link_to '[+]', new_newsitem }
+      %h3 Newsitems (#{newsitems.count}) #{link_to image_new, new_newsitem }
       = paginate newsitems, :param_name => 'newsitems_page', :views_prefix => 'ish_manager'
       - newsitems.each do |n|
         .panel

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

@@ -3,8 +3,8 @@
 -# ish_manager / tags / _form
 -#
 
-.row
-  = form_for @tag do |f|
+= form_for @tag do |f|
+  .row
     .col-xs-12.col-md-6
       .input-field
         = f.label :name
@@ -13,21 +13,26 @@
       .input-field
         = f.label :name_seo
         = f.text_field :name_seo
+  .row      
     .col-xs-12.col-md-6
       .input-field
-        = f.label "parent tag"
         = f.select :parent_tag_id, options_for_select( @tags_list, :selected => ( params[:for_tag] || @tag.parent_tag_id ) )
+        = f.label "parent tag"
     .col-xs-12.col-md-6
       .input-field 
-        = f.label "site"
         = f.select :site, options_for_select( @sites_list, :selected => @tag.site_id )
-    .col-xs-12.col-md-12
-      .input
-        = f.check_box :is_public
-        = f.label :is_public
-      .input
-        = f.check_box :is_trash
-        = f.label :is_trash
-      .actions
-        %br
-        = f.submit
+        = f.label "site"
+  .row      
+    .col-xs-12.col-md-3
+      = f.check_box :is_public
+      = f.label :is_public
+    .col-xs-12.col-md-3
+      = f.check_box :is_feature
+      = f.label :is_feature
+    .col-xs-12.col-md-3
+      = f.check_box :is_trash
+      = f.label :is_trash
+  .row
+    .actions
+      %br
+      = f.submit

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

@@ -1,6 +1,8 @@
 
 %li
   %div
+    - if tag.is_feature
+      %i.fa.fa-exclamation
     = link_to tag.name, tag_path(tag)
     = link_to '[+]', new_tag_path( :for_tag => tag.id )
     = link_to '[~]', edit_tag_path( tag )

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

@@ -1,4 +1,4 @@
 
 %h3
-  Edit Tag #{@tag.name}
+  Edit Tag #{link_to @tag.name, tag_path(@tag)}
 = render 'form', :tag => @tag

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

@@ -5,7 +5,7 @@
   Topic #{@tag.name}
   
 .row
-  .large-12.columns
+  .col-sm-12
     %h5.center
       Tag
       = @tag.name
@@ -15,7 +15,11 @@
     -# = render 'ads/leaderboard'
     -# .descr= @tag.descr # I don't wanna show this every time to everyone, they know what they are here for.
     = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features]
-      
+    
+.row
+  .col-sm-12
+    = render 'ish_manager/newsitems/index', :newsitems => @tag.newsitems, :resource => @tag, :tag => @tag
+    
 .row
   .col-sm-6
     = render 'ish_manager/reports/index', :reports => @tag.reports, :n_ads => 0

data/config/routes.rb

@@ -1,6 +1,8 @@
 IshManager::Engine.routes.draw do
   root :to => 'application#home'
 
+  resources :campaigns
+
   resources :cities do
     resources :features
     resources :newsitems
@@ -57,7 +59,14 @@ IshManager::Engine.routes.draw do
   resources :stock_options
   resources :stock_watches
 
-  resources :tags
+  resources :tags do
+    resources :features
+    resources :newsitems
+
+    resources :reports
+    resources :galleries
+    resources :videos
+  end
 
   resources :user_profiles
   # resources :user_profiles, :as => :ish_models_user_profiles

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.137
+  version: 0.1.8.138
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,6 +154,7 @@ files:
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
 - app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
+- app/controllers/ish_manager/campaigns_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
 - app/controllers/ish_manager/events_controller.rb
 - app/controllers/ish_manager/features_controller.rb
@@ -200,6 +201,7 @@ files:
 - 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/campaigns/index.haml
 - app/views/ish_manager/cities/_form.haml
 - app/views/ish_manager/cities/_header.haml
 - app/views/ish_manager/cities/edit.haml