effective_classifieds 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499abd956dcfe6893f63acfd7c5ebbb2366e153c6e6e5a04a86af79a74646da2
-  data.tar.gz: 87d620ec5502530caada118714c433ebe3996aa57068b0a826333a62619f3232
+  metadata.gz: c63e81e0e5192044916433851a3611a6dd378fab65da8a5371375b310737bc9f
+  data.tar.gz: cf7fea6948d57d2ed13a82e3f5e90bc6eb922aa1e61e4071deec4e770c0b3ff1
 SHA512:
-  metadata.gz: ea559cede7e5cd77ba26d4e9ad0a5ebad93e43fba6562edc3c5ec10ab620ce37131754f52bc5cb8ba1dd994085349655940507243ada1fc9d7755ae3e48517b5
-  data.tar.gz: e552047d620d5464f504a747d98ce56ab86b1c17f431a974f68bb08fac138d2c34dec723ecd1e99f4044624676d7520d759b148d1de6f5af65fe3303b70ba2ce
+  metadata.gz: b432d9428538383229d8c71f0b15489081ba9028a807e13066fa3cc1850b03eca22962bc713d0a995afd2f4616df0e05e8773ae2c19a48986ec0c22662765d8c
+  data.tar.gz: 9721963c16dbab88c25303f923ffb440532663085a9d48722e6616e8465bb36d46afe59ea305aa2f1994ae11f44842756ec428bef1d523919506c09d3b70ab35

data/README.md

@@ -39,21 +39,18 @@ Then migrate the database:
 rake db:migrate
 ```
 
-Please add the following to your User model:
-
-```
-effective_classifieds_user
-
-Use the following datatables to display to your user their applicants dues:
+Please add the following to your user dashboard page:
 
 ```haml
-%h2 My Classifieds
-- datatable = EffectiveClassifiedsDatatable.new(self)
+.card.card-dashboard.mb-4
+  .card-body= render 'effective/classifieds/dashboard'
+
+.card.card-dashboard.mb-4
+  .card-body= render 'effective/classified_submissions/dashboard'
 ```
 
 and
 
-```
 Add a link to the admin menu:
 
 ```haml

data/app/controllers/effective/classified_submissions_controller.rb

@@ -11,7 +11,7 @@ module Effective
       existing = resource_scope.in_progress.where.not(id: resource).first
 
       if existing.present?
-        flash[:success] = "You have been redirected to your existing in progress classified submission"
+        flash[:success] = "You have been redirected to your in-progress classified ad submission"
         redirect_to effective_classifieds.classified_submission_build_path(existing, existing.next_step)
       end
     end

data/app/controllers/effective/classifieds_controller.rb

@@ -2,21 +2,6 @@ module Effective
   class ClassifiedsController < ApplicationController
     include Effective::CrudController
 
-    def index
-      @classifieds ||= Effective::Classified.classifieds(user: current_user)
-
-      @classifieds = @classifieds.paginate(page: params[:page])
-
-      # if params[:search].present?
-      #   search = params[:search].permit(EffectiveClassifieds.permitted_params).delete_if { |k, v| v.blank? }
-      #   @classifieds = @classifieds.where(search) if search.present?
-      # end
-
-      EffectiveResources.authorize!(self, :index, Effective::Classified)
-
-      @page_title ||= ['Classifieds', (" - Page #{params[:page]}" if params[:page])].compact.join
-    end
-
     def show
       @classified = resource_scope.find(params[:id])
 

data/app/datatables/admin/effective_classifieds_datatable.rb

@@ -29,7 +29,7 @@ module Admin
       end
 
       col :title
-      col :body
+      col :body, visible: false
       col :slug, visible: false
 
       col :organization

data/app/datatables/effective_classified_submissions_datatable.rb

@@ -6,15 +6,15 @@ class EffectiveClassifiedSubmissionsDatatable < Effective::Datatable
     col :token, visible: false
     col :created_at, visible: false
 
-    col :submitted_at do |submission|
+    col :submitted_at, label: 'Submitted' do |submission|
       submission.submitted_at&.strftime('%F') || 'Incomplete'
     end
 
-    col :classified, search: :string
+    col :classified, search: :string, label: 'Title'
 
     col :owner, visible: false, search: :string
 
-    col :status do |submission|
+    col :status, visible: false do |submission|
       submission.classified&.status || submission.status
     end
 
@@ -22,8 +22,7 @@ class EffectiveClassifiedSubmissionsDatatable < Effective::Datatable
       if submission.draft?
         dropdown_link_to('Continue', effective_classifieds.classified_submission_build_path(submission, submission.next_step), 'data-turbolinks' => false)
       else
-        dropdown_link_to('Show', effective_classifieds.classified_submission_path(submission))
-        dropdown_link_to('Edit', effective_classifieds.edit_classified_path(submission.classified)) if submission.classified
+        dropdown_link_to('Edit', effective_classifieds.edit_classified_path(submission.classified))
       end
 
       dropdown_link_to('Delete', effective_classifieds.classified_submission_path(submission), 'data-confirm': "Really delete #{submission}?", 'data-method': :delete)

data/app/datatables/effective_classifieds_datatable.rb

@@ -1,21 +1,26 @@
 # Dashboard Classifieds
 class EffectiveClassifiedsDatatable < Effective::Datatable
   datatable do
+    length :all
     order :start_on
 
-    col :start_on, as: :date, label: 'Starts'
-    col :end_on, as: :date, label: 'Ends'
+    col :start_on, as: :date, label: 'Posted'
 
-    col :title
-    col :organization
-    col :location
+    col :title do |classified|
+      link_to classified, effective_classifieds.classified_path(classified)
+    end
+
+    col :end_on, as: :date, label: 'Expires', visible: false
+
+    col :organization, visible: false
+    col :location, visible: false
 
     col :body, visible: false
     col :website, visible: false
     col :email, visible: false
     col :phone, visible: false
 
-    actions_col(edit: false)
+    # actions_col(edit: false)
   end
 
   collection do

data/app/models/concerns/effective_classifieds_classified_submission.rb

@@ -83,7 +83,7 @@ module EffectiveClassifiedsClassifiedSubmission
 
   # Instance Methods
   def to_s
-    'classified submission'
+    'classified ad submission'
   end
 
   def in_progress?

data/app/models/effective/classified.rb

@@ -10,7 +10,7 @@ module Effective
     log_changes if respond_to?(:log_changes)
     acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
-    # This will be the owner of the classified submission
+    # This will be the owner of the classified ad submission
     # Or the admin user that created it
     belongs_to :owner, polymorphic: true
 
@@ -21,7 +21,7 @@ module Effective
 
     acts_as_statused(
       :draft,       # Initial state
-      :submitted,   # Once submitted by the classified submission.
+      :submitted,   # Once submitted by the classified ad submission.
       :approved     # Exit state. Classified was approved.
     )
 

data/app/views/effective/classified_submissions/_classified.haml

@@ -1,12 +1,13 @@
-= card do
-  .row
-    .col-sm
-      %h5.card-title= classified_submission.wizard_step_title(:classified)
-    .col-sm-auto.text-right
-      = link_to('Edit', wizard_path(:classified)) if edit_effective_classified_submissions_wizard?
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= classified_submission.wizard_step_title(:classified)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:classified)) if edit_effective_classified_submissions_wizard?
 
-  - classified = classified_submission.classified
+    - classified = classified_submission.classified
 
-  - if classified.present?
-    = render('effective/classifieds/classified', classified: classified) do
-      = classified.body
+    - if classified.present?
+      = render('effective/classifieds/classified', classified: classified) do
+        = classified.body

data/app/views/effective/classified_submissions/_dashboard.html.haml

@@ -1,28 +1,30 @@
--# In progress submission
-- submission = EffectiveClassifieds.ClassifiedSubmission.in_progress.for(current_user).first
-- datatable = EffectiveResources.best('EffectiveClassifiedSubmissionsDatatable').new(self, namespace: :effective)
+- if can?(:new, EffectiveClassifieds.ClassifiedSubmission)
 
-- if submission.present?
-  %h2 In Progress Classified Submissions
+  -# In-progress submission
+  - submission = EffectiveClassifieds.ClassifiedSubmission.in_progress.for(current_user).first
+  - datatable = EffectiveResources.best('EffectiveClassifiedSubmissionsDatatable').new(self, namespace: :effective)
 
-  %p
-    Your submission for #{submission.classified.presence || 'a classified'} is incomplete
+  - if submission.present?
+    %h2 In-progress Classified Ads
 
-  %p
-    Please
-    = link_to("Continue submission for #{submission.classified.presence || 'a classified'}", effective_classifieds.classified_submission_build_path(submission, submission.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
-    or you can
-    = link_to('Abandon submission', effective_classifieds.classified_submission_path(submission), 'data-confirm': "Really delete #{submission}?", 'data-method': :delete, class: 'btn btn-danger')
-    to submit another.
+    %p
+      Your submission for #{submission.classified.presence || 'a classified'} is incomplete.
 
-  %hr
+    %p
+      Please
+      = link_to("Continue submission for #{submission.classified.presence || 'a classified'}", effective_classifieds.classified_submission_build_path(submission, submission.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      or you can
+      = link_to('Abandon submission', effective_classifieds.classified_submission_path(submission), 'data-confirm': "Really delete #{submission}?", 'data-method': :delete, class: 'btn btn-danger')
+      to submit another.
 
-%h2 Classified Submissions
+    %hr
 
-- if datatable.present?
-  = render_simple_datatable(datatable)
-- else
-  %p You have no past classified submissions. When you do, we'll show them here.
+  %h2 Classified Ads
 
-- if submission.blank?
-  %p= link_to 'Submit New Classified', effective_classifieds.new_classified_submission_path, class: 'btn btn-primary'
+  - if datatable.present?
+    = render_simple_datatable(datatable)
+  - else
+    %p You don't have any classified ads. When you do, we'll show them here.
+
+  - if submission.blank?
+    %p= link_to 'Submit New Classified Ad', effective_classifieds.new_classified_submission_path, class: 'btn btn-primary'

data/app/views/effective/classified_submissions/_summary.html.haml

@@ -1,4 +1,4 @@
-= card('Classified Submission') do
+= card('Classified Ad') do
   - classified = classified_submission.classified
 
   %table.table.table-sm

data/app/views/effective/classified_submissions/classified.html.haml

@@ -1,17 +1,16 @@
-= render 'layout' do
-  = render 'effective/classified_submissions/content', resource: resource
+= render 'effective/classified_submissions/content', resource: resource
 
-  .card
-    .card-body
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+.card
+  .card-body
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-        = f.fields_for :classified, (f.object.classified || f.object.build_classified) do |fc|
-          = fc.hidden_field :id
+      = f.fields_for :classified, (f.object.classified || f.object.build_classified) do |fc|
+        = fc.hidden_field :id
 
-          = fc.hidden_field :owner_id, value: f.object.owner_id
-          = fc.hidden_field :owner_type, value: f.object.owner_type
+        = fc.hidden_field :owner_id, value: f.object.owner_id
+        = fc.hidden_field :owner_type, value: f.object.owner_type
 
-          = render('effective/classifieds/fields', f: fc, classified: fc.object)
+        = render('effective/classifieds/fields', f: fc, classified: fc.object)
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/app/views/effective/classified_submissions/start.html.haml

@@ -3,9 +3,13 @@
 
   .card
     .card-body
-      %p Welcome #{current_user}!
+      %p
+        Welcome #{current_user}!
 
-      %p You are about to submit a classified
+      %p
+        You can use this wizard to post a new classified ad.
+        Your progress will be saved as you move through the wizard.
+        Once the ad published you will be able to come back and edit/change the details.
 
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id

data/app/views/effective/classified_submissions/summary.html.haml

@@ -5,4 +5,4 @@
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
-    = f.submit 'Submit Classified', class: 'btn btn-primary'
+    = f.submit 'Submit Classified Ad', class: 'btn btn-primary'

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

@@ -1,50 +1,46 @@
-.card.effective-classified
+.card
   .card-body
-    %h5.card-title= classified.title
-
     %table.table.effective-classified-table
       %tbody
         %tr
-          %td Category
+          %th Category
           %td= classified.category
 
         %tr
-          %td Available
-          %td #{classified.start_on&.strftime('%F')} to #{classified.end_on&.strftime('%F')}
+          %th Title
+          %td= classified.title
 
         %tr
-          %td Location
-          %td= classified.location.presence || '-'
+          %th Available
+          %td
+            #{classified.start_on&.strftime('%F')}
+            to
+            #{classified.end_on&.strftime('%F')}
+
+        - if classified.website.present?
+          %tr
+            %th Location
+            %td= classified.location
 
         %tr
-          %td Website
-          %td
-            - if classified.website.present?
-              = link_to(classified.website, classified.website, target: '_blank')
-            - else
-              = '-'
+          %th Description
+          %td= classified.body
 
         %tr
-          %td Contact
+          %th Company
           %td= classified.organization
 
-        %tr
-          %td Email
-          %td
-            - if classified.email.present?
-              = mail_to(classified.email)
-            - else
-              = '-'
+        - if classified.website.present?
+          %tr
+            %th Website
+            %td= link_to(classified.website, classified.website, target: '_blank')
 
-        %tr
-          %td Phone
-          %td
-            - if classified.phone.present?
-              = classified.phone
-            - else
-              = '-'
-
-    - if block_given?
-      = yield
-    - else
-      %p= link_to('View Classified', effective_classifieds.classified_path(classified), class: 'btn btn-primary')
+        - if classified.email.present?
+          %tr
+            %th Email
+            %td= mail_to(classified.email)
+
+        - if classified.phone.present?
+          %tr
+            %th Phone
+            %td= classified.phone

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

@@ -2,7 +2,10 @@
 
 - published = Effective::Classified.classifieds(user: current_user).count
 
-- datatable = EffectiveClassifiedsDatatable.new(self, namespace: :effective)
-= render_datatable(datatable, simple: true)
+- if published > 0
+  - datatable = EffectiveClassifiedsDatatable.new(self, namespace: :effective)
+  = render_datatable(datatable, simple: true)
+- else
+  %p There are no active classified ads. When there are, we'll show them here.
 
 %p= link_to 'View All Classifieds', effective_classifieds.classifieds_path, class: 'btn btn-primary'

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

@@ -1,5 +1,6 @@
-= f.text_field :title
 = f.select :category, EffectiveClassifieds.categories, required: true
+= f.text_field :title
+= f.text_field :location
 
 - if f.object.persisted? || f.object.errors.include?(:slug)
   - current_url = (effective_classifieds.classified_url(f.object) rescue nil)
@@ -7,22 +8,27 @@
 
 - minDate = [Time.zone.now, f.object.created_at].compact.min
 
-= f.date_field :start_on, label: "Classified Start",
-  hint: 'The classified ad will be displayed starting on this date',
-  input_js: { minDate: minDate.strftime('%F') }
+.row
+  .col-lg-6
+    = f.date_field :start_on, label: "Start",
+      hint: 'The classified ad will be displayed starting after this date.',
+      input_js: { minDate: minDate.strftime('%F') }
 
-= f.date_field :end_on, label: "Classified End",
-  hint: 'The classified ad will no longer be displayed on this date'
+  .col-lg-6
+    = f.date_field :end_on, label: "Expire",
+      hint: 'The classified ad will no longer be displayed after this date.'
 
 - if f.object.persisted? && !f.object.draft?
   = f.check_box :archived, label: 'Yes, this classified is archived and will not be displayed'
 
-%h2 Classified Content
-= f.rich_text_area :body, hint: 'The main body of your classified'
-= f.text_field :location
-= f.url_field :website
+= f.rich_text_area :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
+
 
-%h2 Contact Information
-= f.text_field :organization
+%h2.mt-5.mb-0 Contact Information
+%p
+  %small.text-muted Contact information will be displayed on the classified ad.
+
+= f.text_field :organization, label: 'Company or Organization'
+= f.url_field :website
 = f.email_field :email
 = f.tel_field :phone

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

@@ -0,0 +1,5 @@
+.card
+  .card-body
+    = effective_form_with(model: @classified, engine: true) do |f|
+      = render('effective/classifieds/fields', f: f, classified: f.object)
+      = effective_submit(f)

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

@@ -1,8 +1,8 @@
-%h1= @page_title
+.resource-buttons
+  = link_to 'Submit New Classified Ad', effective_classifieds.new_classified_submission_path, class: 'btn btn-primary'
 
-= render 'layout' do
-  .effective-classifieds
-    = render partial: @classifieds, spacer_template: 'spacer'
-
-  %nav.d-flex.justify-content-center
-    = bootstrap_paginate(@classifieds, per_page: EffectiveClassifieds.per_page)
+= card do
+  - if @datatable
+    = render_datatable(@datatable, simple: true)
+  - else
+    %p There are no active classified ads. When there are, we'll show them here.

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

@@ -1,8 +1,8 @@
-= render 'layout' do
-  .effective-classified
-    - unless @classified.published?
-      .alert.alert-warning This classified is currently unavailable.
+.effective-classified
+  - unless @classified.published?
+    .alert.alert-warning.mb-4 This classified is currently unavailable.
 
-    = render 'effective/classifieds/classified', classified: @classified do
-      .classified-body.classified-content
-        = @classified.body
+  = render 'effective/classifieds/classified', classified: @classified
+
+  .resource-buttons.text-left
+    = link_to 'View All Classifieds', effective_classifieds.classifieds_path, class: 'btn btn-primary'

data/app/views/effective/classifieds_mailer/classified_submitted.html.haml

@@ -1,16 +1,20 @@
 %p Hello Admin!
 
 - if @classified.published?
-  %p The following classified has been submitted and is published online:
+  %p The following classified ad has been submitted and is published online:
 - else
-  %p The following classified has been submitted and is awaiting your approval:
-  %p= link_to('Approve Classified', effective_classifieds.edit_admin_classified_path(@classified))
+  %p The following classified ad has been submitted and is awaiting your approval:
+
+%hr
 
 = render('effective/classifieds/classified', classified: @classified) do
   %p= @classified.body
 
 %hr
 
-%p= link_to('View Classified', effective_classifieds.classified_path(@classified))
+- if !@classified.published?
+  %p= link_to('Approve Classified Ad', effective_classifieds.edit_admin_classified_path(@classified))
+
+%p= link_to('View Classified Ad', effective_classifieds.classified_path(@classified))
 
 %p Have a great day!

data/config/effective_classifieds.rb

@@ -3,7 +3,7 @@ EffectiveClassifieds.setup do |config|
   config.classified_submissions_table_name = :classified_submissions
 
   # Every classified must have a category.
-  config.categories = ['Job Board', 'Equipment Sales']
+  config.categories = ['Job', 'Equipment Sales', 'Other']
 
   # Layout Settings
   # Configure the Layout per controller, or all at once
@@ -13,7 +13,7 @@ EffectiveClassifieds.setup do |config|
   # config.classified_submission_class_name = 'Effective::ClassifiedSubmission'
 
   # Pagination length on the Classified#index page
-  config.per_page = 10
+  config.per_page = :all
 
   # Classified can be restricted by role
   config.use_effective_roles = true
@@ -21,7 +21,7 @@ EffectiveClassifieds.setup do |config|
   # Automatically end classifieds after this duration
   config.max_duration = 3.months
 
-  # Automatically approve classified submissions, otherwise require admin approval
+  # Automatically approve classified ad submissions, otherwise require admin approval
   config.auto_approve = false
 
   # Mailer Configuration

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,8 +209,7 @@ files:
 - app/views/effective/classifieds/_dashboard.html.haml
 - app/views/effective/classifieds/_fields.html.haml
 - app/views/effective/classifieds/_form.html.haml
-- app/views/effective/classifieds/_layout.html.haml
-- app/views/effective/classifieds/_spacer.html.haml
+- app/views/effective/classifieds/edit.html.haml
 - app/views/effective/classifieds/index.html.haml
 - app/views/effective/classifieds/show.html.haml
 - app/views/effective/classifieds_mailer/classified_submitted.html.haml

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

@@ -1 +0,0 @@
-= yield

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

@@ -1 +0,0 @@
-%hr