wco_models 3.1.0.154 → 3.1.0.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8214f97a78a923e7696ac257e51c35e82735e5f49ee72fb5323897c263494eed
-  data.tar.gz: 50a95c9ae5bc39baf0f5ed8c959b537219e6646accffd52f46577941c393835e
+  metadata.gz: f1d7c8e819f70c838d7784f3c628844e554e86f33b473c78db9552d7a1fbd7b0
+  data.tar.gz: 513a0bcd49ce21e5bdf59c776d97656969b39783d2cb54e946642ca7f0ef6aba
 SHA512:
-  metadata.gz: 2ee8c67d727e601dbf625f4309651d56611f147852e50091bb0f8144b4b25aa382a88268fce8475a975157a9fd01e97d8bc7bdc06c980dd02084fe47eb6683c9
-  data.tar.gz: 7356863e168fc520d0dd7ba14a9a4e02bd4b77b97b92a00df164569f0136162446a843189495fde59eac51d804cae0a93adccfc99b2a292aca8c6af579cb3bc1
+  metadata.gz: a03e9edbd32ffc5a3844fab246ea8aca3c3b88a206b2aebb65d9b92ab6162cee11bd66d94e54e35503701e0b705578079fb0886e45ab1cc1140826de6725f6c9
+  data.tar.gz: 0ebd890f1f25d37bf40395098185f532d50e0e566e65fffadc9f6e41861ada1e33e388c53b08eebb6f2334ac75209063c881d2de1ac1b0d71a22a79d55dad17f

data/app/assets/stylesheets/wco/utils.scss

@@ -167,7 +167,7 @@ textarea.monospace {
 /* M */
 
 .maxwidth {
-  width: 1000px;
+  max-width: 1000px; /* @TODO: this would be responsive by-breakpoint _vp_ 2024-04-23 */
   margin: auto;
 }
 
@@ -188,6 +188,16 @@ textarea.monospace {
   width: calc( 100% - 1em );
 }
 
+/* R */
+
+label.required {
+  &:after {
+    content: ' *';
+    color: red;
+  }
+}
+
+
 /* S */
 .spacer-small {
   height: 20px;

data/app/controllers/wco/invoices_controller.rb

@@ -56,32 +56,13 @@ class Wco::InvoicesController < Wco::ApplicationController
     @invoice = Wco::Invoice.new params[:invoice].permit!
     authorize! :create, @invoice
 
-    stripe_invoice = Stripe::Invoice.create({
-      customer:          @invoice.leadset.customer_id,
-      collection_method: 'send_invoice',
-      days_until_due:    0,
-      # collection_method: 'charge_automatically',
-      pending_invoice_items_behavior: 'exclude',
-    })
-    params[:invoice][:items].each do |item|
-      stripe_price = Wco::Price.find( item[:price_id] ).price_id
-      puts! stripe_price, 'stripe_price'
-      invoice_item = Stripe::InvoiceItem.create({
-        customer: @invoice.leadset.customer_id,
-        price:    stripe_price,
-        invoice:  stripe_invoice.id,
-        quantity: item[:quantity],
-      })
-    end
-    Stripe::Invoice.finalize_invoice( stripe_invoice[:id] )
-    if params[:do_send]
-      Stripe::Invoice.send_invoice(stripe_invoice[:id])
-      flash_notice "Scheduled to send the invoice via stripe."
-    end
-    @invoice.update_attributes({ invoice_id: stripe_invoice[:id] })
-
     if @invoice.save
       flash_notice "Created the invoice."
+
+      if params[:do_send]
+        Stripe::Invoice.send_invoice(@invoice[:invoice_id])
+      end
+
       redirect_to action: :show, id: @invoice.id
     else
       flash_alert "Cannot create invoice: #{@invoice.errors.messages}"

data/app/controllers/wco/leads_controller.rb

@@ -1,14 +1,23 @@
 
 class Wco::LeadsController < Wco::ApplicationController
-
   before_action :set_lists
 
   def create
-    params[:lead][:tags].delete ''
-    params[:lead][:leadset] = nil if params[:lead][:leadset].blank?
+    params[:lead][:tag_ids]&.delete ''
+    params[:lead].delete :leadset_id if params[:lead][:leadset_id].blank?
 
     @lead = Wco::Lead.new params[:lead].permit!
     authorize! :create, @lead
+
+    if params[:lead][:photo]
+      photo = Wco::Photo.new photo: params[:lead][:photo]
+      photo.is_public = true
+      if photo.save
+        @lead.photo = photo
+      end
+      params[:lead].delete :photo
+    end
+
     if @lead.save
       flash_notice 'ok'
     else
@@ -26,8 +35,6 @@ class Wco::LeadsController < Wco::ApplicationController
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.all
 
-
-
     if params[:q].present?
       q = params[:q].downcase
       @leads = @leads.any_of(
@@ -41,19 +48,6 @@ class Wco::LeadsController < Wco::ApplicationController
       end
     end
 
-    # if params[:q_tag_ids].present?
-    #   carry = nil
-    #   params[:q_tag_ids].each do |term_id|
-    #     lts = LeadTag.where({ term_id: term_id }).map(&:lead_id)
-    #     if carry
-    #       carry = carry & lts
-    #     else
-    #       carry = lts
-    #     end
-    #   end
-    #   @leads = Lead.where({ :id.in => carry })
-    # end
-
     @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
   end
 
@@ -77,11 +71,21 @@ class Wco::LeadsController < Wco::ApplicationController
   end
 
   def update
-    params[:lead][:tags].delete ''
-    params[:lead].delete :leadset if params[:lead][:leadset].blank?
+    params[:lead][:tag_ids]&.delete ''
+    params[:lead].delete :leadset_id if params[:lead][:leadset_id].blank?
 
     @lead = Wco::Lead.find params[:id]
     authorize! :update, @lead
+
+    if params[:lead][:photo]
+      photo = Wco::Photo.new photo: params[:lead][:photo]
+      photo.is_public = true
+      if photo.save
+        @lead.photo = photo
+      end
+      params[:lead].delete :photo
+    end
+
     if @lead.update params[:lead].permit!
       flash_notice 'ok'
     else

data/app/controllers/wco/sites_controller.rb

@@ -1,6 +1,13 @@
 
 class Wco::SitesController < Wco::ApplicationController
 
+  def check_sitemap
+    @site = Wco::Site.find params[:id]
+    authorize! :check_sitemap, @site
+    @site.check_sitemap
+    redirect_to request.referrer
+  end
+
   def create
     @site = Wco::Site.new params[:site].permit!
     authorize! :create, @site
@@ -41,6 +48,8 @@ class Wco::SitesController < Wco::ApplicationController
   def show
     @site = Wco::Site.find params[:id]
     authorize! :show, @site
+
+    @new_sitemap_path = Wco::SitemapPath.new( site_id: @site.id )
   end
 
   def update

data/app/models/wco/invoice.rb

@@ -14,6 +14,8 @@ class Wco::Invoice
   include Mongoid::Paranoia
   store_in collection: 'ish_invoice'
 
+  attr_accessor :is_stripe
+
   field :email, type: String
 
   field :invoice_id, type: String # stripe
@@ -35,7 +37,29 @@ class Wco::Invoice
   field :description, type: String
   field :items,       type: Array   # used by stripe
 
-
+  before_validation :create_stripe, on: :create
+  def create_stripe
+    if is_stripe
+      stripe_invoice = Stripe::Invoice.create({
+        customer:          leadset.customer_id,
+        collection_method: 'send_invoice',
+        days_until_due:    0,
+        # collection_method: 'charge_automatically',
+        pending_invoice_items_behavior: 'exclude',
+      })
+      items.each do |item|
+        stripe_price = Wco::Price.find( item[:price_id] ).price_id
+        invoice_item = Stripe::InvoiceItem.create({
+          customer: leadset.customer_id,
+          price:    stripe_price,
+          invoice:  stripe_invoice.id,
+          quantity: item[:quantity],
+        })
+      end
+      Stripe::Invoice.finalize_invoice( stripe_invoice[:id] )
+      self.invoice_id = stripe_invoice[:id]
+    end
+  end
 
   ## Prawn/pdf unit of measure is 1/72"
   ## Canvas width: 612, height: 792

data/app/models/wco/office_action_template.rb

@@ -29,13 +29,13 @@ class Wco::OfficeActionTemplate
   has_many :prev_ties, class_name: 'OfficeActionTemplateTie', inverse_of: :next_office_action_template
   accepts_nested_attributes_for :ties
 
+  has_and_belongs_to_many :email_filters, class_name: WcoEmail::EmailFilter
+
   def to_s
     "#{slug}"
   end
-
   def self.list
     [[nil,nil]] + all.map { |ttt| [ ttt.slug, ttt.id ] }
   end
-
 end
-OAT ||= Wco::OfficeActionTemplate
+# OAT ||= Wco::OfficeActionTemplate

data/app/models/wco/site.rb

@@ -14,8 +14,11 @@ class Wco::Site
     [nil] + KINDS
   end
 
-  has_many :publishers # , class_name: 'Wco::Publisher'
+
   has_many :headlines # , class_name: 'Wco::Newstitle'
+  has_many :logs, inverse_of: :obj
+  has_many :publishers # , class_name: 'Wco::Publisher'
+  has_many :sitemap_paths, class_name: 'Wco::SitemapPath'
   has_many :tags, class_name: 'Wco::Tag'
 
   field :slug
@@ -101,4 +104,112 @@ class Wco::Site
     puts "ok"
   end
 
+  def check_sitemap
+    results = []
+    total_count = 0
+    error_count = 0
+
+    sitemap_paths.each do |check|
+      total_count += 1
+
+      # puts "Checking #{check[:path]}:"
+      if check[:selector]
+        begin
+          body = HTTParty.get( "#{origin}#{check[:path]}" ).body
+        rescue OpenSSL::SSL::SSLError => err
+          results.push "NOT OK [ssl-exception] #{check[:path]}".red
+          logg "NOT OK [ssl-exception] #{check[:path]}"
+          check.update status: 'NOT OK'
+
+          next
+        end
+        doc = Nokogiri::HTML( body )
+        out = doc.search check[:selector]
+        if out.present?
+          results.push "OK #{check[:path]}"
+          logg "OK #{check[:path]}"
+          check.update status: 'OK'
+        else
+          results.push "NOT OK [selector-missing] #{check[:path]}".red
+          logg "NOT OK [selector-missing] #{check[:path]}"
+          check.update status: 'NOT OK'
+          error_count += 1
+        end
+
+        if check[:meta_description]
+          out = doc.search( 'head meta[name="description"]' )[0]['content']
+          if check[:meta_description] == out
+            results.push "OK #{check[:path]} meta_description"
+            logg "OK #{check[:path]} meta_description"
+            check.update status: 'OK'
+          else
+            results.push "NOT OK [meta-description-missing] #{check[:path]}".red
+            logg "NOT OK [meta-description-missing] #{check[:path]}"
+            check.update status: 'NOT OK'
+            error_count += 1
+          end
+        end
+
+      elsif check[:redirect_to]
+        out = HTTParty.get( "#{origin}#{check[:path]}", follow_redirects: false )
+        if( out.headers[:location] == check[:redirect_to] ||
+            out.headers[:location] == "#{origin}#{check[:redirect_to]}" )
+          results.push "OK #{check[:path]}"
+          logg "OK #{check[:path]}"
+          check.update status: 'OK'
+        else
+          results.push "NOT OK [redirect-missing] #{check[:path]}".red
+          logg "NOT OK [redirect-missing] #{check[:path]}"
+          check.update status: 'NOT OK'
+
+          puts!( out.response, 'response' ) if DEBUG
+          # puts!( out.body, 'body' ) if DEBUG
+
+          error_count += 1
+
+          puts "NOT OK #{check[:path]}".red
+          puts out.headers[:location]
+          puts check[:redirect_to]
+        end
+      else
+        results.push "SKIP #{check[:path]}"
+        logg "SKIP #{check[:path]}"
+        check.update status: 'SKIP'
+      end
+
+      if check[:selectors]
+        check[:selectors].each do |selector|
+          body = HTTParty.get( "#{origin}#{check[:path]}" ).body
+          doc = Nokogiri::HTML( body )
+          out = doc.search selector
+          if out.present?
+            results.push "OK #{check[:path]} selectors:#{selector}"
+            logg "OK #{check[:path]} selectors:#{selector}"
+            check.update status: 'OK'
+          else
+            results.push "NOT OK [selectors-missing:#{selector}] #{check[:path]}".red
+            logg "NOT OK [selectors-missing:#{selector}] #{check[:path]}"
+            check.update status: 'NOT OK'
+            error_count += 1
+          end
+        end
+      end
+
+    end
+
+    puts "Results:".green
+    results.each do |r|
+      puts r
+    end
+    puts "Total count: #{total_count}"
+    puts "Error count: #{error_count}"
+  end
+
+  def logg msg
+    Wco::Log.create!({
+      message: msg,
+      obj: self,
+    })
+  end
+
 end

data/app/models/wco/sitemap_path.rb

@@ -0,0 +1,20 @@
+
+class Wco::SitemapPath
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_sitemap_paths'
+
+  belongs_to :site, class_name: 'Wco::Site'
+
+  field :path,        type: String
+  validates :path, presence: true, uniqueness: { scope: :site }
+
+  field :redirect_to, type: String
+  field :selector,    type: String
+  field :selectors,   type: Array, default: []
+
+  field :status,      type: String
+
+end
+

data/app/models/wco_email/email_filter.rb

@@ -10,6 +10,9 @@ class WcoEmail::EmailFilter
 
   PAGE_PARAM_NAME = :filters_page
 
+  FIELD_OPTS     = [ :subject, :from, :to, :to_and_cc, :body, ]
+  MATCHTYPE_OPTS = [ :regex, :exact_insensitive, ]
+
   field :from_regex
   field :from_exact
   field :subject_regex
@@ -20,6 +23,10 @@ class WcoEmail::EmailFilter
   field :skip_from_regex
   field :skip_to_exact
 
+  has_many :email_filter_conditions
+  has_many :email_filter_skip_conditions, class_name: 'WcoEmail::EmailFilterCondition'
+  has_and_belongs_to_many :action_tmpls, class_name: 'Wco::OfficeActionTemplate'
+
   belongs_to :tag, class_name: 'Wco::Tag', inverse_of: :email_filters, optional: true
 
   KIND_AUTORESPOND_TMPL = 'autorespond-template'
@@ -36,6 +43,7 @@ class WcoEmail::EmailFilter
   KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS]
   field :kind
 
+
   belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
 

data/app/models/wco_email/email_filter_condition.rb

@@ -0,0 +1,17 @@
+
+class WcoEmail::EmailFilterCondition
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'office_email_filter_conditions'
+
+  belongs_to :email_filter,      inverse_of: :email_filter_conditions
+  belongs_to :email_filter_skip, inverse_of: :email_filter_skip_conditions
+
+  field :field
+  field :matchtype
+  field :value
+
+
+end
+

data/app/models/wco_email/message.rb

@@ -29,7 +29,10 @@ class WcoEmail::Message
 
   field :read_at, type: DateTime
   index({ read_at: -1 })
-  scope :unread, ->{ where( read_at: nil ) }
+  def self.unread
+    where( read_at: nil )
+  end
+  # scope :unread, ->() { where( read_at: nil ) }
 
   def part_html_sanitized
     doc = Nokogiri::HTML part_html

data/app/models/wco_game/location.rb

@@ -0,0 +1,257 @@
+
+# require 'ish/premium_item'
+require 'ish/utils'
+
+class WcoGame::Location
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  # include Ish::PremiumItem
+  include Mongoid::Paranoia
+  include Wco::Utils
+  store_in collection: 'gameui_maps'
+
+  field :name
+
+  field :newsitems_page_size, default: 25
+
+  field :slug
+  validates :slug, uniqueness: true, presence: true
+
+  field :description
+
+  has_many :markers,      :class_name => '::Gameui::Marker', inverse_of: :map
+  has_many :from_markers, :class_name => '::Gameui::Marker', inverse_of: :destination
+
+  has_many :newsitems, inverse_of: :map, order: :created_at.desc
+
+  # @TODO: remove field, replace with relation. _vp_ 2022-09-13
+  field :parent_slug
+  belongs_to :parent, class_name: '::Gameui::Map', inverse_of: :childs, optional: true
+  has_many :childs, class_name: '::Gameui::Map', inverse_of: :parent
+
+  has_one :image, class_name: '::Ish::ImageAsset', inverse_of: :location
+  belongs_to :creator_profile, class_name: '::Ish::UserProfile', inverse_of: :my_maps
+
+  has_and_belongs_to_many :bookmarked_profiles, class_name: '::Ish::UserProfile', inverse_of: :bookmarked_location
+
+  # shareable, nonpublic
+  field :is_public, type: Boolean, default: true
+  scope :public, ->{ where( is_public: true ) }
+  has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_locations
+
+  field :version, type: String, default: '0.0.0'
+
+  ## @TODO: or self, right? and refactor this, seems N+1. _vp_ 2022-09-13
+  field :map_slug
+  def map
+    ::Gameui::Map.where( slug: map_slug ).first
+  end
+
+  RATED_OPTIONS = [ 'pg-13', 'r', 'nc-17' ]
+  field :rated, default: 'pg-13' # 'r', 'nc-17'
+
+  ## Possible keys: description, map, markers, newsitems,
+  field :labels, type: Object, default: <<~AOL
+    { "description":"Description", "map":"Map", "markers":"Markers", "newsitems":"Newsitems"
+    }
+  AOL
+
+  ## Possible keys:
+  ## config.description.collapsible
+  field :config, type: Object, default: <<~AOL
+    { "map_panel_type": "ThreePanelV1",
+      "studio": { "hasFloor": true, "studioLength": 2500, "studioWidth": 2500 }
+    }
+  AOL
+
+  # @deprecated, dont use!
+  field :img_path
+
+  ## Not used! See config.map_panel_type instead.
+  # MAP_TYPES = [ :map_2d, :map_3d, :map_geospatial, :map_gallery, :map_toc ] ## Mostly not implemented. _vp_ 2022-09-06
+  # field :map_type, default: :map_2d
+
+  ## Make sure to use x,y,z and w,h as appropriate.
+  ## @TODO: abstract this into a module
+  field :x, type: Float
+  field :y, type: Float
+  field :z, type: Float
+
+  ## Make sure to use x,y,z and w,h as appropriate.
+  field :w, type: Integer
+  validates :w, presence: true
+  field :h, type: Integer
+  validates :h, presence: true
+  # @TODO: this is shared between map and marker, move to a concern.
+  before_validation :compute_w_h
+  def compute_w_h
+    return if !image ## @TODO: test this
+
+    begin
+      geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
+      self.w = geo.width
+      self.h = geo.height
+    rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
+      puts! e, 'Could not #compute_w_h'
+      # @TODO: do something with this
+    end
+  end
+
+  ORDERING_TYPE_ALPHABETIC = 'alphabetic'
+  ORDERING_TYPE_CUSTOM     = 'custom'
+  ORDERING_TYPE_TIMESTAMP  = 'timestamp'
+  ORDERING_TYPES = [ ORDERING_TYPE_ALPHABETIC, ORDERING_TYPE_CUSTOM, ORDERING_TYPE_TIMESTAMP ]
+  field :ordering_type, type: String, default: 'custom' # timestamp, alphabetic, custom
+  validates :ordering_type, presence: true
+
+  def self.list conditions = { is_trash: false }
+    out = self.order_by( created_at: :desc )
+    [[nil, nil]] + out.map { |item| [ item.name, item.id.to_s ] }
+  end
+
+  def breadcrumbs
+    out = [{ name: self.name, slug: self.slug, link: false }]
+    p = self.parent
+    while p
+      out.push({ name: p.name, slug: p.slug })
+      p = p.parent
+    end
+    out.reverse
+  end
+
+  ##
+  ## @TODO: move the export func, below, to a module. _vp_ 2022-09-20
+  ##
+
+  def empty_export
+    return {
+      galleries: {},
+      image_assets: {},
+      maps: {}, markers: {},
+      newsitems: {},
+      photos: {}, profiles: {},
+      reports: {},
+      videos: {},
+    }
+  end
+  def self.empty_export; Gameui::Map.new.empty_export; end
+
+  def empty_export_arr
+    return {
+      galleries: [],
+      image_assets: [],
+      maps: [], markers: [],
+      newsitems: [],
+      photos: [], profiles: [],
+      reports: [],
+      videos: [],
+    }
+  end
+
+  def export_key_to_class
+    return {
+      galleries: 'Gallery',
+      image_assets: 'Ish::ImageAsset',
+      maps: 'Gameui::Map',
+      markers: 'Gameui::Marker',
+      newsitems: 'Newsitem',
+      photos: 'Photo',
+      profiles: 'Ish::UserProfile',
+      reports: 'Report',
+      videos: 'Video',
+      # 'galleries' => 'Gallery',
+      # 'image_assets' => 'Ish::ImageAsset',
+      # 'maps' => 'Gameui::Map',
+      # 'markers' => 'Gameui::Marker',
+      # 'newsitems' => 'Newsitem',
+      # 'photos' => 'Photo',
+      # 'profiles' => 'Ish::UserProfile',
+      # 'reports' => 'Report',
+      # 'videos' => 'Video',
+    }.with_indifferent_access
+  end
+  def self.export_key_to_class
+    Map.new.export_key_to_class
+  end
+
+  def export_fields
+    %w|
+      creator_profile_id config
+      deleted_at description
+      h
+      is_public
+      labels
+      map_slug
+      name
+      ordering_type
+      parent_slug
+      rated
+      slug
+      version
+      w
+    |
+  end
+
+  ## This is the starting point _vp_ 2022-03-12
+  ##
+  def export_subtree
+    collected = collect(empty_export)
+    exportable = empty_export_arr
+    collected.map do |k, v|
+      if v.present?
+        v.map do |id|
+          id = id[0]
+          item = export_key_to_class[k].constantize.unscoped.find id
+          export = item.export
+          exportable[k].push( export )
+        end
+      end
+    end
+    JSON.pretty_generate exportable
+  end
+
+  def collect export_object
+    map = self
+    export_object[:maps][map.id.to_s] = map.id.to_s
+
+    if map.markers.present?
+      map.markers.map do |marker|
+        id = marker.id.to_s
+        if !export_object[:markers][id]
+          marker.collect( export_object )
+        end
+        export_object[:markers][id] = id
+      end
+    end
+
+    if map.newsitems.present?
+      map.newsitems.map do |newsitem|
+        id = newsitem.id.to_s
+        export_object[:newsitems][id] = id
+        newsitem.collect export_object
+      end
+    end
+
+    ## @TODO: maybe implement this later, maybe not. _vp_ 2022-03-12
+    # if map.childs.present?
+    #   export_object[:maps].push( map.childs.map &:id )
+    #   map.childs.map do |child|
+    #     child.collect export_object
+    #   end
+    # end
+
+    if map.creator_profile.present?
+      export_object[:profiles][map.creator_profile.id.to_s] = map.creator_profile.id.to_s
+    end
+
+    if map.image.present?
+      export_object[:image_assets][map.image.id.to_s] = map.image.id.to_s
+    end
+
+    export_object
+  end
+
+  ## endExport
+
+
+end

data/app/models/wco_game/marker.rb

@@ -0,0 +1,9 @@
+
+class WcoGame::Marker
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  include Wco::Utils
+  store_in collection: 'gameui_markers'
+
+end

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

@@ -1,6 +1,9 @@
 !!!
 %html
   %head
+    %title #{@page_title} | Wco Core
+    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
+    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
     %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}
     %title Wco Models
 

data/app/views/wco/_main_header.haml

@@ -7,36 +7,39 @@
 
     %i.fa.fa-compress.collapse-expand#collapseHeaderModels
       Wco Suite
-    .flex-row
-      %ul
-        %li= link_to 'ROOT', '/'
-        - if defined? wco_email
-          %li= link_to '/email',   '/email'
-        - if defined? wco_hosting
-          %li= link_to '/hosting', '/hosting'
-        - if defined? iro
-          %li= link_to '/trading', '/trading'
-
-      %ul
-        %li= render '/wco/invoices/header'
-        %li= render '/wco/products/header'
-        %li= render '/wco/tags/header'
-        %li= render '/wco/logs/header'
-
-      %ul
-        %li= render '/wco/leadsets/header'
-        %li= render '/wco/leads/header'
-        %li= render '/wco/office_action_templates/header'
-        %li= render '/wco/office_actions/header'
-        %li= render '/wco/profiles/header'
-
-      %ul
-        %li= render '/wco/sites/header'
-        %li= render '/wco/headlines/header'
-        %li= render '/wco/publishers/header'
-        %li= render '/wco/galleries/header_mini'
-        %li= render '/wco/reports/header'
-        %li= render '/wco/videos/header'
+    .W
+
+      .d-flex.flex-wrap
+
+        %ul
+          %li= link_to 'ROOT', '/'
+          - if defined? wco_email
+            %li= link_to '/email',   '/email'
+          - if defined? wco_hosting
+            %li= link_to '/hosting', '/hosting'
+          - if defined? iro
+            %li= link_to '/trading', '/trading'
+
+        %ul
+          %li= render '/wco/invoices/header'
+          %li= render '/wco/products/header'
+          %li= render '/wco/tags/menuitem'
+          %li= render '/wco/logs/header'
+
+        %ul
+          %li= render '/wco/leadsets/header'
+          %li= render '/wco/leads/header'
+          %li= render '/wco/office_action_templates/header'
+          %li= render '/wco/office_actions/header'
+          %li= render '/wco/profiles/header'
+
+        %ul
+          %li= render '/wco/sites/header'
+          %li= render '/wco/headlines/header'
+          %li= render '/wco/publishers/header'
+          %li= render '/wco/galleries/header_mini'
+          %li= render '/wco/reports/header'
+          %li= render '/wco/videos/header'
 
 
     .c

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

@@ -6,8 +6,9 @@
     = f.text_field :name
 
   .field
-    = f.label :email
-    = f.text_field :email
+    %label.required Email
+    = f.text_field :email, required: true
+    .small.gray Required to create a leadset
 
   .field
     = f.label :phone
@@ -19,7 +20,7 @@
 
   .field
     = f.label "Leadset (company)"
-    = f.select :leadset, options_for_select(@leadsets_list, selected: lead.leadset_id), {}, { class: :select2 }
+    = f.select :leadset_id, options_for_select(@leadsets_list, selected: lead.leadset_id), {}, { class: :select2 }
 
   -# .field
   -#   %label Rating
@@ -31,10 +32,10 @@
 
   .field
     = f.label "Tags"
-    = f.select :tags, options_for_select(@tags_list, selected: lead.tag_ids ), {}, { class: :select2, multiple: true }
+    = f.select :tag_ids, options_for_select(@tags_list, selected: lead.tag_ids ), {}, { class: :select2, multiple: true }
 
   .field
-    = f.label :photo
+    %label Photo
     = f.file_field :photo
 
   .actions

data/app/views/wco/leads/_list.haml

@@ -0,0 +1,16 @@
+
+%ul.leads--list
+  - leads.each do |lead|
+    %li.item
+      = image_tag lead.photo.photo.url(:thumb)
+      = link_to lead, lead_path(lead)
+      = link_to '[~]', edit_lead_path(lead)
+
+      -# \(#{lead.scheduled_email_actions.length} sch
+      -# %span.expand-next [+]
+      -# .expand-hide= render 'ish_manager/scheduled_actions/form_mini'
+      -# \)
+
+      - if defined?( wco_email )
+        %span.expand-next [reply]
+        .expand-hide= render '/wco_email/contexts/form_reply_mini', lead: lead

data/app/views/wco/leads/{_index.haml → _table.haml}

@@ -39,7 +39,7 @@
               = link_to '[~]', edit_lead_path( lead )
               = link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
             %td
-              = image_tag lead.photo.url(:thumb) if lead.photo
+              = image_tag lead.photo.photo.url(:thumb) if lead.photo
             %td.company
               = lead.leadset.company_url
             %td

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

@@ -14,4 +14,4 @@
         (#{@leads.length})
       = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
 
-  = render 'index', leads: @leads, search_path: leads_path
+  = render '/wco/leads/table', leads: @leads, search_path: leads_path

data/app/views/wco/leads/show.haml

@@ -22,16 +22,16 @@
           %li Address: #{@lead.address}
         -# - if @lead.comment
         -#   %li Comment: #{raw @lead.comment}
-        - if @lead.photo
-          %li
-            = image_tag Photo.find( @lead.photo_id ).photo.url(:small)
 
     .col-md-6
+      - if @lead.photo
+        = image_tag @lead.photo.photo.url(:thumb2)
+
       %h5 Tags
       %ul
         - @lead.tags.each do |tag|
           %li
-            = link_to tag.name, tag_path(tag)
+            = link_to tag, tag_path(tag)
 
   .row
     .col-md-6.ctxs

data/app/views/wco/sitemap_paths/_form.haml

@@ -0,0 +1,18 @@
+
+.sitemap-paths--form
+  = form_for spath do |f|
+    = hidden_field_tag :site_id, spath[:site_id] || params[:site_id]
+
+    .d-flex
+      .field
+        %label Path
+        = f.text_field :path
+      .field
+        %label redirect_to
+        = f.text_field :redirect_to
+      .field
+        %label selector
+        = f.text_field :selector
+
+      .actions
+        = f.submit 'Go'

data/app/views/wco/sitemap_paths/_index.haml

@@ -0,0 +1,15 @@
+
+.sitemap-paths--index
+  %table.bordered.data-table
+    %thead
+      %td Path
+      %td Redirect To
+      %td Selector
+      %td Status
+    %tbody
+      - spaths.each do |spath|
+        %tr
+          %td= spath.path
+          %td= spath.redirect_to
+          %td= spath.selector
+          %td= spath.status

data/app/views/wco/sites/show.haml

@@ -1,8 +1,18 @@
 
-.sites-show.maxwidth
-  .header
-    %h5.title
-      = @site
+.sites-show.padded
+  .maxwidth
+    .header
+      %h5.title
+        = @site
 
-  = render '/wco/tags/header'
-  = render '/wco/tags/index', tags: @site.tags
+    = render '/wco/tags/header'
+    = render '/wco/tags/index', tags: @site.tags
+
+  %h5.d-flex
+    Sitemap Paths 
+    = link_to '[+]', new_sitemap_path_path( site_id: @site.id )
+     
+    = button_to 'check', check_sitemap_path( site: @site ), data: { confirm: 'Are you sure?' }
+  = render '/wco/sitemap_paths/form', spath: @new_sitemap_path
+  -# %hr
+  = render '/wco/sitemap_paths/index', spaths: @site.sitemap_paths

data/app/views/wco/tags/_header.haml

@@ -1,7 +1,5 @@
 
-.d-flex
-  = link_to "Tags (#{Wco::Tag.all.length})", wco.tags_path
-  .inline-search
-    = form_tag wco.tags_path, method: :get do
-      = text_field_tag :q
-  = link_to '[+]', wco.new_tag_path
+.header
+  %h5.title
+    Tags (#{Wco::Tag.all.length}) 
+    = link_to '[+]', wco.new_tag_path

data/app/views/wco/tags/_index.haml

@@ -10,4 +10,5 @@
         <b>N reports:</b> #{tag.reports.length}
         <b>N videos:</b> #{tag.videos.length}
         <b>N stubs:</b> #{tag.message_stubs.length}
+        <b>N leads:</b> #{tag.leads.length}
         <b>N logs:</b> #{tag.logs.length}

data/app/views/wco/tags/_menuitem.haml

@@ -0,0 +1,9 @@
+
+.d-flex
+  = link_to "Tags (#{Wco::Tag.all.length})", wco.tags_path
+   
+  .inline-search
+    = form_tag wco.tags_path, method: :get do
+      = text_field_tag :q
+   
+  = link_to '[+]', wco.new_tag_path

data/app/views/wco/tags/index.haml

@@ -1,7 +1,7 @@
 
 .tags-index.maxwidth
   .header
-    %h5.title Tags
+    %h5.title Tags (#{@tags.length})
 
   = render 'index', tags: @tags
 

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

@@ -14,12 +14,17 @@
         <b>Message Stubs (#{@tag.message_stubs.length}):&nbsp;</b>
         = render '/wco_email/message_stubs/index', stubs: @tag.message_stubs
 
+    %li.d-flex
+      <b>Galleries (#{@galleries.length}):&nbsp;</b>
+      = render 'wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
     %li.d-flex
       <b>Headlines (#{@tag.headlines.length}):&nbsp;</b>
       = render '/wco/headlines/index', headlines: @tag.headlines
+
     %li.d-flex
-      <b>Galleries (#{@galleries.length}):&nbsp;</b>
-      = render 'wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
+      <b>Leads (#{@tag.leads.length}):&nbsp;</b>
+      = render 'wco/leads/list', leads: @tag.leads
+
     %li.d-flex
       <b>Reports (#{@reports.length}):&nbsp;</b>
       = render 'wco/reports/index', reports: @reports, config: { skip_tags: true }

data/config/routes.rb

@@ -54,7 +54,9 @@ Wco::Engine.routes.draw do
   get 'reports/deleted', to: 'reports#index', as: :deleted_reports, defaults: { deleted: true }
   resources :reports
 
+  post 'sites/:id/check_sitemap', to: 'sites#check_sitemap', as: :check_sitemap
   resources :sites
+  resources :sitemap_paths
   resources :subscriptions
 
   delete 'tags/remove/:id/from/:resource/:resource_id', to: 'tags#remove_from', as: :remove_tag_from

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.154
+  version: 3.1.0.157
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -455,6 +455,7 @@ files:
 - app/models/wco/publisher.rb
 - app/models/wco/report.rb
 - app/models/wco/site.rb
+- app/models/wco/sitemap_path.rb
 - app/models/wco/subscription.rb
 - app/models/wco/tag.rb
 - app/models/wco/utils.rb
@@ -466,11 +467,14 @@ files:
 - app/models/wco_email/email_action_template.rb
 - app/models/wco_email/email_action_template_tie.rb
 - app/models/wco_email/email_filter.rb
+- app/models/wco_email/email_filter_condition.rb
 - app/models/wco_email/email_template.rb
 - app/models/wco_email/message.rb
 - app/models/wco_email/message_stub.rb
 - app/models/wco_email/obfuscated_redirect.rb
 - app/models/wco_email/unsubscribe.rb
+- app/models/wco_game/location.rb
+- app/models/wco_game/marker.rb
 - app/models/wco_hosting/appliance.rb
 - app/models/wco_hosting/appliance_tmpl.rb
 - app/models/wco_hosting/domain.rb
@@ -527,8 +531,8 @@ files:
 - app/views/wco/leads/_form.haml
 - app/views/wco/leads/_form_import.haml
 - app/views/wco/leads/_header.haml
-- app/views/wco/leads/_index.haml
-- app/views/wco/leads/_index_rows.haml
+- app/views/wco/leads/_list.haml
+- app/views/wco/leads/_table.haml
 - app/views/wco/leads/edit.haml
 - app/views/wco/leads/index.haml
 - app/views/wco/leads/new.haml
@@ -559,7 +563,7 @@ files:
 - app/views/wco/office_actions/index.haml
 - app/views/wco/office_actions/new.haml
 - app/views/wco/office_actions/show.haml
-- app/views/wco/photos/_form.haml
+- app/views/wco/photos/_form.haml-trash
 - app/views/wco/photos/_index_thumbs.haml
 - app/views/wco/photos/_meta.haml
 - app/views/wco/photos/_meta_manager.haml
@@ -597,6 +601,8 @@ files:
 - app/views/wco/reports/index_table.haml
 - app/views/wco/reports/new.haml
 - app/views/wco/reports/show.haml
+- app/views/wco/sitemap_paths/_form.haml
+- app/views/wco/sitemap_paths/_index.haml
 - app/views/wco/sites/_form.haml
 - app/views/wco/sites/_header.haml
 - app/views/wco/sites/edit.haml
@@ -608,6 +614,7 @@ files:
 - app/views/wco/tags/_index.haml
 - app/views/wco/tags/_index_chips.haml
 - app/views/wco/tags/_list_chips.haml
+- app/views/wco/tags/_menuitem.haml
 - app/views/wco/tags/edit.haml
 - app/views/wco/tags/index.haml
 - app/views/wco/tags/new.haml

data/app/views/wco/leads/_index_rows.haml

@@ -1,11 +0,0 @@
-
-.leads--index-rows
-  - leads.each do |lead|
-    .item
-      = link_to lead.email, lead_path(lead)
-      \(#{lead.scheduled_email_actions.length} sch
-      %span.expand-next [+]
-      .expand-hide= render 'ish_manager/scheduled_actions/form_mini'
-      \)
-      %span.expand-next [reply]
-      .expand-hide= render 'ish_manager/email_contexts/form_reply', lead: lead