effective_classifieds 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79336bbb620e6d45dee7ef30b76c3e8d6af610355c5839e6995edc190eeead60
-  data.tar.gz: f679373fb3056d855711d9e6668e68e06cb434f1804ca7f0052e8d86aeb5f82d
+  metadata.gz: 7064c7d9f3e797ce52d20ca502bbb0d790339c0fb52f74364c0d93eaa8927a4e
+  data.tar.gz: 057bae1906a935f14f76b8edd7f5624fb4720c660656c40a79262ff2cb284902
 SHA512:
-  metadata.gz: 0e4add172e382d41b1f78407971a33170afd46e138c71913210e51508beddc9b7588714cd411aa9e2e7827abf31245a377cdf8d40c725317756ba0efb3fc9138
-  data.tar.gz: 50009a6e425035cc59e58abbcf32ce6d70e73eb19a9c7be131e5c50de1ca6bd14ee37729c288709279d7492a71dc506e68ce132c430db205f36c65e15d22a228
+  metadata.gz: cda01569456e9e3fe538526ea2503750b2d4c9372c7cd608164dcb077a7290ad94a5a4178f25a4200df0213544a8786aaa6add3714b4307bbdb5d050ef3d17d9
+  data.tar.gz: 49c51e24af0654dac4af2c7b81b87b728aa7addf4bc80cadb6f11a6feb1b66835d0125e26472d0dfaffe0656a782fb8866d2460bd85d1ff3fc354c7ab7a78b66

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])
@@ -22,6 +28,12 @@ module Effective
       end
 
       @page_title ||= @classified.to_s
+
+      respond_to do |format|
+        format.html { }
+        format.js { render('show', formats: :js) }
+      end
+
     end
 
     private

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

@@ -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/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

@@ -10,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/101_create_effective_classifieds.rb

@@ -14,6 +14,7 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.0]
       t.string :location
 
       t.string :website
+      t.string :contact_name
       t.string :email
       t.string :phone
 

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails