effective_classifieds 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd50a8e12797b1b7a7da7081e55c077efc5141775706430fbffd440bf744b911
-  data.tar.gz: fd97d6b44bbfa9b076f5cf419edc1b9e58572cbc04abcba91ad0a68bbd0a1ebc
+  metadata.gz: aec287b86538a846f94eac97ae954c12dfbb40bb3f3d80ee9af2b0f2f890c018
+  data.tar.gz: d2c22f4f4df5e5ea9c1262b7a9b5b2d5fd66424d09c1c5e9f50ed7ac71292584
 SHA512:
-  metadata.gz: 27283385e03edd3c6588e90a05fba8beffc9864c219b88e6b882c487263bd40b374683bd074750530f62acd3a766b718f4becc0d664a41ad675a7e5cc0af0a11
-  data.tar.gz: 36e596bbfb2b110a180d6c470500d1675136ac6cd629c8f4478569081cf2b10f72772dc6c25b2127cc36207f0889f12a830470c28ce49d389848c8562997b1f2
+  metadata.gz: c8d6202d90d61f56ae7ae6dcb8076b595768c9c48431b966fe8a865b9a322f51dcc028f4efbd3b3d5646b201f353bcba7b2e472a311235530e7a49c540e5c755
+  data.tar.gz: 396ed75c112d6ce31564005a65c989ce6f1332c84372a9ac440ffdad9bba7add8186f1d6d0b334f6b504be87b5b621483345bda58f8fcd7040be5dd921f3a2fa

data/app/controllers/effective/classifieds_controller.rb

@@ -2,7 +2,13 @@ module Effective
   class ClassifiedsController < ApplicationController
     include Effective::CrudController
 
-    page_title(only: :index) { view_context.classifieds_name_label }
+    def index
+      EffectiveResources.authorize!(self, :index, ::Effective::Classified)
+
+      @page_title ||= view_context.classifieds_name_label
+
+      @classifieds = ::Effective::Classified.classifieds(user: current_user).sorted
+    end
 
     def show
       @classified = resource_scope.find(params[:id])

data/app/datatables/admin/effective_classifieds_datatable.rb

@@ -37,9 +37,10 @@ module Admin
       col :organization
       col :location
 
-      col :website
-      col :email
-      col :phone
+      col :website, visible: false
+      col :contact_name, visible: false
+      col :email, visible: false
+      col :phone, visible: false
 
       col :status
       col :archived

data/app/models/effective/classified.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class Classified < ActiveRecord::Base
-    self.table_name = EffectiveClassifieds.classifieds_table_name.to_s
+    self.table_name = (EffectiveClassifieds.classifieds_table_name || :classifieds).to_s
 
     attr_accessor :current_user
     attr_accessor :importing
@@ -125,6 +125,7 @@ module Effective
       validates :organization, presence: true
       validates :email, presence: true
       validates :phone, presence: true
+      validates :contact_name, presence: true
     end
 
     validate(if: -> { start_on.present? && end_on.present? && !importing }) do

data/app/models/effective/classified_wizard.rb

@@ -1,6 +1,6 @@
 module Effective
   class ClassifiedWizard < ActiveRecord::Base
-    self.table_name = EffectiveClassifieds.classified_wizards_table_name.to_s
+    self.table_name = (EffectiveClassifieds.classified_wizards_table_name || :classified_wizards).to_s
 
     effective_classifieds_classified_wizard
   end

data/app/views/effective/classifieds/_classified.html.haml

@@ -1,51 +1,8 @@
--# TODO turn this into a partial that is rendered on index
-
-%table.table.effective-classified-table
-  %tbody
-    %tr
-      %th Category
-      %td= classified.category
-
-    %tr
-      %th Title
-      %td= classified.title
-
-    %tr
-      %th Available
-      %td
-        #{classified.start_on&.strftime('%F')}
-        to
-        #{classified.end_on&.strftime('%F')}
-
-    - if classified.location.present?
-      %tr
-        %th Location
-        %td= classified.location
-
-    %tr
-      %th Description
-      %td= classified.body.to_s
-
-    - if classified.file.attached?
-      %tr
-        %th Attachment
-        %td= link_to(classified.file.filename, main_app.url_for(classified.file), target: '_blank')
-
-    %tr
-      %th Company
-      %td= classified.organization
-
-    - if classified.website.present?
-      %tr
-        %th Website
-        %td= link_to(classified.website, classified.website, target: '_blank')
-
-    - if classified.email.present?
-      %tr
-        %th Email
-        %td= mail_to(classified.email)
-
-    - if classified.phone.present?
-      %tr
-        %th Phone
-        %td= classified.phone
+%tr
+  %td.col-date= classified.start_on&.strftime("%b %d, %Y")
+  %td.col-date.d-none.d-md-table-cell= classified.end_on&.strftime("%b %d, %Y")
+  %td
+    %strong= link_to classified.title, effective_classifieds.classified_path(classified)
+    .text-muted= classified.organization
+
+  %td.d-none.d-md-table-cell= classified.location

data/app/views/effective/classifieds/_fields.html.haml

@@ -1,5 +1,6 @@
-= f.select :category, EffectiveClassifieds.categories, required: true
+= f.select :category, EffectiveClassifieds.categories, required: true, include_blank: false
 = f.text_field :title
+= f.text_field :organization, hint: 'Organization or company name'
 = f.text_field :location
 
 - if f.object.persisted? || f.object.errors.include?(:slug)
@@ -22,17 +23,17 @@
   = f.check_box :archived, label: 'Yes, this posting is archived. It will not be displayed.'
 
 - if defined?(EffectiveArticleEditor)
-  = f.article_editor :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information!'
+  = f.article_editor :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information.'
 - else
-  = f.rich_text_area :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information!'
+  = f.rich_text_area :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information.'
 
-= f.file_field :file, hint: 'Please attach a PDF'
+= f.file_field :file, hint: 'Optionally attach a PDF for this posting'
 
 %h2.mt-5.mb-0 Contact Information
 %p
-  %small.text-muted Contact information will be displayed on the #{classifieds_name_label} ad.
+  %small.text-muted The following contact information is not displayed to the public and is only used by staff to provide support.
 
-= f.text_field :organization, hint: 'Organization or company name'
+= f.text_field :contact_name
 = f.url_field :website
 = f.email_field :email
 = f.tel_field :phone

data/app/views/effective/classifieds/index.html.haml

@@ -2,8 +2,20 @@
   .resource-buttons
     = link_to "Submit New #{et(Effective::Classified)}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
 
-  = card do
-    - if @datatable.present?(self)
-      = render_datatable(@datatable, simple: true)
-    - else
-      %p There are no active #{etsd(Effective::Classified)}. When there are, we'll show them here.
+  - if @classifieds.present?
+    .table-responsive
+      %table.table.table-striped.table-hover
+        %tr
+          %th.col-date Published
+          %th.col-date.d-none.d-md-table-cell Closing
+          %th Title
+          %th.d-none.d-md-table-cell Location
+
+        = render @classifieds
+
+    .resource-buttons
+      = link_to "Submit New #{et(Effective::Classified)}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+
+  - else
+    = card class: 'mt-5' do
+      %p.text-center There are no active #{etsd(Effective::Classified)}. When there are, we'll show them here.

data/app/views/effective/classifieds/show.html.haml

@@ -3,48 +3,44 @@
     - unless @classified.published?
       .alert.alert-warning.mb-4 This #{etd(@classified)} is not published.
 
-    .row
-      .col-md-4
-        %ul.list-unstyled
-          %li
-            %strong Company
-            = @classified.organization
-
-          - if @classified.location.present?
-            %li
-              %strong Location
-              = @classified.location
-
-          %li
-            %strong Published
-            #{@classified.start_on&.strftime("%b %d, %Y")}
-
-          %li
-            %strong Closing
-            #{@classified.end_on&.strftime("%b %d, %Y")}
-
-
-          - if @classified.file.attached?
-            %li
-              %strong Attachment
-              = link_to(@classified.file.filename, main_app.url_for(@classified.file), target: '_blank')
-
-
-        %ul.list-unstyled
-          - if @classified.website.present?
-            %li
-              %strong Website
-              = link_to(@classified.website, @classified.website, target: '_blank')
-
-          - if @classified.email.present?
-            %li
-              %strong Email
-              = mail_to(@classified.email)
-
-          - if @classified.phone.present?
-            %li
-              %strong Phone
-              = @classified.phone
-
-      .col-md-8
-        = @classified.body.to_s
+
+    .resource-buttons
+      = link_to "Return to  #{classifieds_name_label}", effective_classifieds.classifieds_path, class: 'btn btn-secondary'
+
+    = card do
+      .row
+        .col-md
+          %table.table.table-striped.table-hover.effective-table-summary
+            %tr
+              %th Position
+              %td= @classified.title
+
+            %tr
+              %th Company
+              %td= @classified.organization
+
+              - if @classified.location.present?
+                %tr
+                  %th Location
+                  %td= @classified.location
+
+        .col-md
+          %table.table.table-striped.table-hover.effective-table-summary
+            %tr
+              %th Published
+              %td #{@classified.start_on&.strftime("%b %d, %Y")}
+
+            %tr
+              %th Closing
+              %td #{@classified.end_on&.strftime("%b %d, %Y")}
+
+            - if @classified.file.attached?
+              %tr
+                %th Attachment
+                %td= link_to(@classified.file.filename, main_app.url_for(@classified.file), target: '_blank')
+
+    .body.mt-4
+      = @classified.body.to_s
+
+    .resource-buttons.mt-5.mb-4
+      = link_to "Return to  #{classifieds_name_label}", effective_classifieds.classifieds_path, class: 'btn btn-secondary'

data/config/effective_classifieds.rb

@@ -1,7 +1,4 @@
 EffectiveClassifieds.setup do |config|
-  config.classifieds_table_name = :classifieds
-  config.classified_wizards_table_name = :classified_wizards
-
   # Every classified must have a category.
   config.categories = ['Job', 'Equipment Sales', 'Other']
 
@@ -13,7 +10,7 @@ EffectiveClassifieds.setup do |config|
   # config.classified_wizard_class_name = 'Effective::ClassifiedWizard'
 
   # Pagination length on the Classified#index page
-  config.per_page = :all
+  config.per_page = 12
 
   # Classified can be restricted by role
   config.use_effective_roles = true

data/db/migrate/{01_create_effective_classifieds.rb.erb → 101_create_effective_classifieds.rb}

@@ -1,6 +1,6 @@
-class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
+class CreateEffectiveClassifieds < ActiveRecord::Migration[6.0]
   def change
-    create_table <%= @classifieds_table_name %> do |t|
+    create_table :classifieds do |t|
       t.integer :classified_wizard_id
       t.string :classified_wizard_type
 
@@ -14,6 +14,7 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.string :location
 
       t.string :website
+      t.string :contact_name
       t.string :email
       t.string :phone
 
@@ -39,10 +40,10 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.timestamps
     end
 
-    add_index <%= @classifieds_table_name %>, [:owner_id, :owner_type]
-    add_index <%= @classifieds_table_name %>, :slug
+    add_index :classifieds, [:owner_id, :owner_type]
+    add_index :classifieds, :slug
 
-    create_table <%= @classified_wizards_table_name %> do |t|
+    create_table :classified_wizards do |t|
       t.string :token
 
       t.integer :owner_id
@@ -65,7 +66,7 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.datetime :created_at
     end
 
-    add_index <%= @classified_wizards_table_name %>, [:owner_id, :owner_type]
-    add_index <%= @classified_wizards_table_name %>, :token
+    add_index :classified_wizards, [:owner_id, :owner_type]
+    add_index :classified_wizards, :token
   end
 end

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/lib/generators/effective_classifieds/install_generator.rb

@@ -20,10 +20,7 @@ module EffectiveMemberships
       end
 
       def create_migration_file
-        @classifieds_table_name  = ':' + EffectiveClassifieds.classifieds_table_name.to_s
-        @classified_wizards_table_name  = ':' + EffectiveClassifieds.classified_wizards_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_classifieds.rb.erb', 'db/migrate/create_effective_classifieds.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_classifieds.rb', 'db/migrate/create_effective_classifieds.rb'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -250,7 +250,7 @@ files:
 - config/effective_classifieds.rb
 - config/locales/effective_classifieds.en.yml
 - config/routes.rb
-- db/migrate/01_create_effective_classifieds.rb.erb
+- db/migrate/101_create_effective_classifieds.rb
 - db/seeds.rb
 - lib/effective_classifieds.rb
 - lib/effective_classifieds/engine.rb