ish_manager 0.1.8.141 → 0.1.8.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3090e1d4074c2b01099f187c22521cc4a2c147d
-  data.tar.gz: e52ec43b445ba034d373e1d2a1b90bbbc7914299
+  metadata.gz: 5914b12b2e0f8a249356ed9e644b8dcf4cf13a0a
+  data.tar.gz: fe87201127aa62bd4e18acca648f902adbc31120
 SHA512:
-  metadata.gz: 7a99d95e9c39f4fd4b9f5fe09e37ba29e13b69b5df9fe8e7a3335a1bb74b6682961402c28d1411f71805eb902e0388d6994bda70f96d06036d723f32bacad293
-  data.tar.gz: 9a4a36f56b37769ce4bfbcd037badc68fc26f43a42043d313c00dd771480977728b5efaef396fa44f59a06394e704f291774342a52f3c87d1cec7a3fad8ecddc
+  metadata.gz: 3dd3ed70db13e6eabac9187f65b418babb6f2583afde700fbbcf90a51d425c7e936f6a0780aaf0782dce145d6ee45e573dcc5fa0585df98bd4cf036781d0698e
+  data.tar.gz: e6cc64a1d0ad4b2b1f907c7c7bc4a88c5a5cf50178c610a10b45d8ccdf1392b5154ebe78e91e7153bd319bd28fd783698b3893fb33ab4dcd672cfe3a5bce6129

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

@@ -10,7 +10,7 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require ish_manager/jquery-3.2.1.min
+// require ish_manager/jquery-3.2.1.min
 //= require ish_manager/bootstrap.min
 //= require ish_manager/jquery.iframe-transport
 //= require ish_manager/jquery.ui.widget
@@ -29,6 +29,7 @@ $(function () {
 });
 
 $(document).ready(function () {
+
   $('*[data-confirm]').click(function(){
     return confirm($(this).attr('data-confirm'));
   });
@@ -40,8 +41,10 @@ $(document).ready(function () {
       plugins: 'link'
     });
   }
-  
-  $('select').material_select()
+
+  if ($('body#application').length > 0) {
+      $('select').material_select()
+  }
 
   $(".caret").each(function(idx) {
     $($(".caret")[idx]).html('')
@@ -89,5 +92,12 @@ $(document).ready(function () {
     $(".content", mainFooterContext).css("display", 'none')
   }
 
+  $('#dataTable').DataTable({
+      pageLength: 10,
+      lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
+      lengthChange: true,
+      "aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]]
+  });
+
 });
  

data/app/controllers/ish_manager/cities_controller.rb

@@ -47,7 +47,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
       @city.profile_photo = photo
     end
     if @city.save
-      ::IshModels::CacheKey.one.update_attributes( :cities => Time.now )
+      ::IshModels::CacheKey.one.update_attributes( :cities => Time.now, :feature_cities => Time.now )
       flash[:notice] = 'Success'
       redirect_to edit_city_path @city.id
     else

data/app/controllers/ish_manager/leads_controller.rb

@@ -8,6 +8,7 @@ class IshManager::LeadsController < IshManager::ApplicationController
     else
       @leads = @leads.where( :is_done => false )
     end
+    render :layout => 'ish_manager/application_no_materialize'
   end
 
   def new

data/app/controllers/ish_manager/venues_controller.rb

@@ -6,6 +6,10 @@ class IshManager::VenuesController < IshManager::ApplicationController
   def index
     authorize! :venues_index, ::Manager
     @venues = Venue.all
+    if params[:city_id]
+      @resource = @city = City.find params[:city_id]
+      @venues = @venues.where( :city => @city )
+    end
   end
 
   def new
@@ -30,6 +34,7 @@ class IshManager::VenuesController < IshManager::ApplicationController
   end
 
   def update
+    params[:venue][:tag_ids].delete ''
     @resource = @venue = Venue.find params[:id]
     authorize! :update, @venue
     update_profile_pic
@@ -49,6 +54,18 @@ class IshManager::VenuesController < IshManager::ApplicationController
     redirect_to :action => :edit, :id => @venue.id
   end
 
+  def destroy
+    @venue = Venue.unscoped.find params[:id]
+    venue_name = @venue.name
+    authorize! :delete, @venue
+    if @venue.destroy
+      flash[:notice] = "Deleted venue #{venue_name}"
+    else
+      flash[:alert] = "Cannot delete venue: #{@venue.errors.messages}"
+    end
+    redirect_to venues_path
+  end
+
 end
 
 

data/app/helpers/ish_manager/images_helper.rb

@@ -125,8 +125,7 @@ module IshManager::ImagesHelper
   end
   
   def image_delete
-    # image_tag 'delete.png'
-    '[x]'
+    raw('<i class="fa fa-trash"></i>')
   end
 
   def image_index

data/app/views/ish_manager/cities/_header.haml

@@ -27,7 +27,8 @@
         Videos (#{@city.videos.count})
       %li
         = link_to image_new, new_city_venue_path( @city )
-        Venues (#{@city.venues.count})
+        = link_to 'Venues', venues_path( :city_id => @city.id )
+        (#{@city.venues.count})
       %li
         = link_to image_new, new_city_event_path( @city )
         = link_to 'Events', city_events_path( @city )

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

@@ -5,9 +5,17 @@
   .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_url
+    = f.text_field :company_url
+  .input-field
+    = f.label :yelp_url
+    = f.text_field :yelp_url
+    
   .input-field
     = f.label :company
     = f.text_field :company

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

@@ -2,23 +2,32 @@
 .manager--leads-index
   %h5
     = link_to 'Leads', leads_path
-    (#{@leads.count})
     = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
-    = link_to '(done)', done_leads_path
+    = link_to '[done]', done_leads_path
     
-  %table
-    %tr
-      %th &nbsp;
-      %th Created At
-      %th Company
-      %th Email
-      %th Job Url
-      %th Description
-    - @leads.each do |lead|
+  %table#dataTable
+    %thead
       %tr
-        %td= link_to raw('<i class="fa fa-play"></i>'), lead_path( lead )
-        %td= pretty_date lead.created_at
-        %td= lead.company
-        %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}"
-        %td= link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank'
-        %td= lead.description
+        %th &nbsp;
+        %th Created At
+        %th Company
+        %th Tag
+        %th Phone
+        %th Email
+        %th Job Url
+        %th Company Url
+        %th Yelp Url
+        %th Description
+    %tbody
+      - @leads.each do |lead|
+        %tr
+          %td= link_to raw('<i class="fa fa-play"></i>'), lead_path( lead )
+          %td= pretty_date lead.created_at
+          %td= lead.company
+          %td= lead.tag
+          %td= lead.phone
+          %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}"
+          %td= link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank'
+          %td= lead.company_url
+          %td= lead.yelp_url
+          %td= lead.description

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

@@ -16,7 +16,7 @@
       .card
         .card-content
           = link_to '[~]', edit_report_path( report )
-          = link_to '[x]', report_path( report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+          .float-left= button_to '[x]', report_path( report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
           - if report.is_public
             %i.material-icons visibility
           - else

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

@@ -7,10 +7,18 @@
     .col-sm-6
       = f.label :name_seo
       = f.text_field :name_seo
-    
-  .a
-    = f.label :descr
-    = f.text_area :descr, :class => [ :tinymce ]
+      
+  .row
+    .col-sm-6
+      = f.label :subhead
+      = f.text_area :subhead
+    .col-sm-6
+      = render 'profile_pic', :resource => venue
+      
+  .row
+    .col-sm-12
+      = f.label :descr
+      = f.text_area :descr, :class => [ :tinymce ]
 
   .row
     .col-sm-6
@@ -21,10 +29,12 @@
       .row
         .col-xs-6= f.text_field :x
         .col-xs-6= f.text_field :y
-      
+
   .row
     .col-sm-6
-      = render 'profile_pic', :resource => venue
-
-  .b
-    = f.submit
+      = f.label :tags
+      = f.select :tag_ids, options_for_select( @tags_list, :selected => venue.tag_ids ), {}, { :multiple => true }
+      
+  .row
+    .col-sm-12
+      = f.submit

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

@@ -1,15 +1,10 @@
 
-.manager-venues--index
-  %h2
-    Venues (#{venues.length})
-    = link_to '[+]', new_venue_path
-  %ol
-    - venues.each do |venue|
-      %li
-        = link_to '[~]', edit_venue_path( venue )
-        .float-left= button_to '[x]', venue_path( venue ), :method => 'delete', :html => { :confirm => 'Are you sure?' }
-        = link_to venue.name, venue_path( venue )
-        %br
-        %br
-        .clearfix
-  %hr
+%ol
+  - venues.each do |venue|
+    %li
+      = link_to image_edit, edit_venue_path( venue )
+      .float-left= button_to '[x]', venue_path( venue ), :method => 'delete', :data => { :confirm => 'Are you sure?' }
+      = link_to venue.name, venue_path( venue )
+      %br
+      %br
+      .clearfix

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

@@ -1,3 +1,9 @@
 
-= render :partial => 'index', :locals => { :venues => @venues }
-        
+.manager-venues--index
+  %h2
+    Venues (#{@venues.length})
+    - if @resource
+      in #{link_to @resource.name, resource_path( @resource )}
+    = link_to image_new, new_venue_path
+  = render 'index', :venues => @venues
+%hr     

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

@@ -6,17 +6,20 @@
     %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
     %meta{ :charset => 'UTF-8' }
     %meta{ :description => 'some description' }
-    %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'
+    %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
+    -# %script{ :src => "//code.jquery.com/jquery-3.3.1.slim.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 "ish_manager/application", media: "all"
     = stylesheet_link_tag "ish_manager/materialize", media: "all"
     = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
     = javascript_include_tag "ish_manager/application"
     = javascript_include_tag "ish_manager/materialize"
     = csrf_meta_tags
-  %body
+  %body#application
     .bg-white
       - role = current_user ? current_user.profile.role_name : ''
       = render :partial => "ish_manager/application/main_header_#{role}"

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

@@ -9,13 +9,17 @@
     %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" }
+    %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 "ish_manager/application", media: "all"
     = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
+    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
     = javascript_include_tag "ish_manager/application"
     = csrf_meta_tags
-  %body
+  %body#application_no_materialize
     .bg-white
-      = render :partial => 'ish_manager/application/main_header'
+      - role = current_user ? current_user.profile.role_name : ''
+      = render :partial => "ish_manager/application/main_header_#{role}"
       .container
         .row
           .col-sm-12

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.141
+  version: 0.1.8.142
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails