effective_classifieds 0.0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b6ec3f5b89b358551558d22206f8ce57ef5002f199a635c9e004155a12ff246
-  data.tar.gz: 0c36fa15a0dd1ae22c8cd74fef90e8b28bd6bec2e74efe2950c3bb32ee24e999
+  metadata.gz: b86483009f7d9be8e80a451b7b957bbfe1ac9ec2d88d7a11e13f36a97a261a6e
+  data.tar.gz: bd9cd48a34bd463f87c12cb3353f9a474f4de95645c4999f9188d10fd2f52d76
 SHA512:
-  metadata.gz: 1377dab4d35fc6f2a0c160f006246380cf3af0adabd97100e5b78c61d5c2402c274d747c7eee3ca4126317fe38efc648dc142a549e0be7e31e2f257d4bcbb937
-  data.tar.gz: 2043dfe2ce40bd423fe50c5c80b2c44be329d28c53504c820bb009188382ccb8cdce2596deaf8d374f97786a8cbf09270c8465cb8067edbdaea1a2a1ae0b440a
+  metadata.gz: 820fd500352d1a4b20cc7ed71f0f9569a25d27ca3d2e6a91befc4d8ccfc3244d882e77dcdbb240e73634b419fb90b5b7abfe0ce5abf09d63c11945f90f690f57
+  data.tar.gz: 5f2c5ea34d257e972c9f3f2e4e30216537a3f899a8c4778af8c578485653b0d134f6e7c4e44146c456efd2cd7cdde55f85e87f5f96b0c0c972ca37c75d6cb924

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_wizards/dashboard'
 ```
 
 and
 
-```
 Add a link to the admin menu:
 
 ```haml
@@ -85,18 +82,18 @@ The permissions you actually want to define are as follows (using CanCan):
 can([:index, :show], Effective::Classified) { |classified| classified.published? }
 can([:show, :edit, :update], Effective::Classified) { |classified| classified.owner == user }
 
-can([:show, :index, :destroy], EffectiveClassifieds.ClassifiedSubmission) { |submission| submission.owner == user }
-can([:update], EffectiveClassifieds.ClassifiedSubmission) { |submission| submission.owner == user && !submission.was_submitted? }
+can(:new, EffectiveClassifieds.ClassifiedWizard)
+can([:show, :index, :destroy], EffectiveClassifieds.ClassifiedWizard) { |submission| submission.owner == user }
+can([:update], EffectiveClassifieds.ClassifiedWizard) { |submission| submission.owner == user && !submission.was_submitted? }
 
 if user.admin?
   can :admin, :effective_classifieds
 
   can(crud - [:destroy], Classified)
-
   can(:approve, Classified) { |classified| classified.was_submitted? && !classified.approved? }
   can(:destroy, Classified) { |classified| !classified.draft? }
 
-  can([:new, :index, :show], EffectiveClassifieds.ClassifiedSubmission)
+  can([:index, :show], EffectiveClassifieds.ClassifiedWizard)
 end
 ```
 

data/app/controllers/admin/classified_wizards_controller.rb

@@ -0,0 +1,19 @@
+module Admin
+  class ClassifiedWizardsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_classifieds) }
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveEvents.ClassifiedWizard.deep.all }
+    datatable -> { Admin::EffectiveClassifiedWizardsDatatable.new }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_classified_wizard) ? :effective_classified_wizard : :classified_wizard)
+      params.require(model).permit!
+    end
+
+  end
+end

data/app/controllers/effective/classified_wizards_controller.rb

@@ -0,0 +1,10 @@
+module Effective
+  class ClassifiedWizardsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::WizardController
+
+    resource_scope -> { EffectiveClassifieds.ClassifiedWizard.deep.where(owner: current_user) }
+
+  end
+end

data/app/controllers/effective/classifieds_controller.rb

@@ -2,26 +2,6 @@ module Effective
   class ClassifiedsController < ApplicationController
     include Effective::CrudController
 
-    resource_scope -> {
-      unpublished = EffectiveResources.authorized?(self, :admin, :effective_classifieds)
-      Effective::Classified.classifieds(user: current_user, unpublished: unpublished)
-    }
-
-    def index
-      @classifieds ||= resource_scope.published
-
-      @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])
 
@@ -46,7 +26,7 @@ module Effective
     private
 
     def permitted_params
-      params.require(:effective_classified).permit!.except(:status, :status_steps)
+      params.require(:effective_classified).except(:status, :status_steps).permit!
     end
 
   end

data/app/datatables/admin/{effective_classified_submissions_datatable.rb → effective_classified_wizards_datatable.rb}

@@ -1,4 +1,4 @@
-class Admin::EffectiveClassifiedSubmissionsDatatable < Effective::Datatable
+class Admin::EffectiveClassifiedWizardsDatatable < Effective::Datatable
   datatable do
     order :created_at
 
@@ -16,7 +16,7 @@ class Admin::EffectiveClassifiedSubmissionsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveSubmissions.ClassifiedSubmission.all.deep.done.joins(:classified)
+    EffectiveSubmissions.ClassifiedWizard.all.deep.done.joins(:classified)
   end
 
 end

data/app/datatables/admin/effective_classifieds_datatable.rb

@@ -18,7 +18,8 @@ module Admin
 
       col :id, visible: false
 
-      col :classified_submission, visible: false, search: :string
+      col :classified_wizard, visible: false, search: :string
+      col :owner, visible: false, label: 'Submitted by'
 
       col :start_on, as: :date
       col :end_on, as: :date
@@ -28,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_wizards_datatable.rb

@@ -0,0 +1,36 @@
+# Dashboard Classified Submissions
+class EffectiveClassifiedWizardsDatatable < Effective::Datatable
+  datatable do
+    order :created_at
+
+    col :token, visible: false
+    col :created_at, visible: false
+
+    col :submitted_at, label: 'Submitted' do |wizard|
+      wizard.submitted_at&.strftime('%F') || 'Incomplete'
+    end
+
+    col :classified, search: :string, label: 'Title'
+
+    col :owner, visible: false, search: :string
+
+    col :status, visible: false do |wizard|
+      wizard.classified&.status || wizard.status
+    end
+
+    actions_col(actions: []) do |wizard|
+      if wizard.draft?
+        dropdown_link_to('Continue', effective_classifieds.classified_wizard_build_path(wizard, wizard.next_step), 'data-turbolinks' => false)
+      else
+        dropdown_link_to('Edit', effective_classifieds.edit_classified_path(wizard.classified))
+      end
+
+      dropdown_link_to('Delete', effective_classifieds.classified_wizard_path(wizard), 'data-confirm': "Really delete #{wizard}?", 'data-method': :delete)
+    end
+  end
+
+  collection do
+    EffectiveClassifieds.ClassifiedWizard.deep.where(owner: current_user).left_joins(:classified)
+  end
+
+end

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/helpers/effective_classifieds_helper.rb

@@ -1,7 +1,2 @@
 module EffectiveClassifiedsHelper
-
-  def edit_effective_classified_submissions_wizard?
-    params[:controller] == 'effective/classified_submissions' && defined?(resource) && resource.draft?
-  end
-
 end

data/app/models/concerns/{effective_classifieds_classified_submission.rb → effective_classifieds_classified_wizard.rb}

@@ -1,28 +1,20 @@
 # frozen_string_literal: true
 
-# EffectiveClassifiedsClassifiedSubmission
+# EffectiveClassifiedsClassifiedWizard
 #
-# Mark your owner model with effective_classifieds_classified_submission to get all the includes
+# Mark your owner model with effective_classifieds_classified_wizard to get all the includes
 
-module EffectiveClassifiedsClassifiedSubmission
+module EffectiveClassifiedsClassifiedWizard
   extend ActiveSupport::Concern
 
   module Base
-    def effective_classifieds_classified_submission
-      include ::EffectiveClassifiedsClassifiedSubmission
+    def effective_classifieds_classified_wizard
+      include ::EffectiveClassifiedsClassifiedWizard
     end
   end
 
   module ClassMethods
-    def effective_classifieds_classified_submission?; true; end
-
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
-    def required_wizard_steps
-      [:start, :summary, :submitted]
-    end
+    def effective_classifieds_classified_wizard?; true; end
   end
 
   included do
@@ -47,7 +39,7 @@ module EffectiveClassifiedsClassifiedSubmission
     accepts_nested_attributes_for :owner
 
     # Effective Namespace
-    has_one :classified, class_name: 'Effective::Classified', inverse_of: :classified_submission, dependent: :destroy
+    has_one :classified, class_name: 'Effective::Classified', inverse_of: :classified_wizard, dependent: :destroy
     accepts_nested_attributes_for :classified, reject_if: :all_blank, allow_destroy: true
 
     effective_resource do
@@ -83,7 +75,7 @@ module EffectiveClassifiedsClassifiedSubmission
 
   # Instance Methods
   def to_s
-    'classified submission'
+    'classified ad submission'
   end
 
   def in_progress?

data/app/models/effective/classified.rb

@@ -10,18 +10,18 @@ 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
 
     # When submitted through the wizard
-    belongs_to :classified_submission, polymorphic: true, optional: true
+    belongs_to :classified_wizard, polymorphic: true, optional: true
 
     has_rich_text :body
 
     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.
     )
 
@@ -102,7 +102,7 @@ module Effective
     end
 
     # Automatically approve submissions created by admins outside the submissions wizard
-    before_validation(if: -> { new_record? && classified_submission.blank? }) do
+    before_validation(if: -> { new_record? && classified_wizard.blank? }) do
       assign_attributes(status: :approved)
     end
 

data/app/models/effective/classified_wizard.rb

@@ -0,0 +1,7 @@
+module Effective
+  class ClassifiedWizard < ActiveRecord::Base
+    self.table_name = EffectiveClassifieds.classified_wizards_table_name.to_s
+
+    effective_classifieds_classified_wizard
+  end
+end

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

@@ -0,0 +1,10 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= classified_wizard.wizard_step_title(:classified)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:classified)) if edit_effective_wizard?
+
+    - classified = classified_wizard.classified
+    = render 'effective/classifieds/classified', classified: classified

data/app/views/effective/classified_wizards/_classified_wizard.html.haml

@@ -0,0 +1,3 @@
+.effective-classified-wizard
+  - classified_wizard.render_steps.each do |partial|
+    = render "effective/classified_wizards/#{partial}", classified_wizard: classified_wizard, step: partial

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

@@ -0,0 +1,30 @@
+- if can?(:new, EffectiveClassifieds.ClassifiedWizard)
+
+  -# In-progress submission
+  - submission = EffectiveClassifieds.ClassifiedWizard.in_progress.for(current_user).first
+  - datatable = EffectiveResources.best('EffectiveClassifiedWizardsDatatable').new(self, namespace: :effective)
+
+  - if submission.present?
+    %h2 In-progress Classified Ads
+
+    %p
+      Your submission for #{submission.classified.presence || 'a classified'} is incomplete.
+
+    %p
+      Please
+      = link_to("Continue submission for #{submission.classified.presence || 'a classified'}", effective_classifieds.classified_wizard_build_path(submission, submission.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      or you can
+      = link_to('Abandon submission', effective_classifieds.classified_wizard_path(submission), 'data-confirm': "Really delete #{submission}?", 'data-method': :delete, class: 'btn btn-danger')
+      to submit another.
+
+    %hr
+
+  %h2 Classified Ads
+
+  - 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_wizard_path, class: 'btn btn-primary'

data/app/views/effective/{classified_submissions → classified_wizards}/_summary.html.haml

@@ -1,5 +1,5 @@
-= card('Classified Submission') do
-  - classified = classified_submission.classified
+= card('Classified Ad') do
+  - classified = classified_wizard.classified
 
   %table.table.table-sm
     %tbody
@@ -16,12 +16,12 @@
         %tr
           %th Owner
           %td
-            - url = (polymorphic_admin_path(classified_submission.owner) rescue "/admin/users/#{classified_submission.owner.to_param}/edit")
-            = link_to(classified_submission.owner, url)
+            - url = (polymorphic_admin_path(classified_wizard.owner) rescue "/admin/users/#{classified_wizard.owner.to_param}/edit")
+            = link_to(classified_wizard.owner, url)
       - else
         %tr
           %th Owner
-          %td= classified_submission.owner
+          %td= classified_wizard.owner
 
       - if classified&.was_submitted?
         %tr

data/app/views/effective/{classified_submissions → classified_wizards}/classified.html.haml

@@ -1,5 +1,5 @@
 = render 'layout' do
-  = render 'effective/classified_submissions/content', resource: resource
+  = render 'effective/classified_wizards/content', resource: resource
 
   .card
     .card-body

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

@@ -0,0 +1,20 @@
+= render 'layout' do
+  = render 'effective/classified_wizards/content', resource: resource
+
+  .card
+    .card-body
+      %p
+        Welcome #{current_user}!
+
+      %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
+
+        = f.hidden_field :owner_type
+        = f.hidden_field :owner_id
+
+        = f.save 'Save and Continue'

data/app/views/effective/classified_wizards/submitted.html.haml

@@ -0,0 +1,14 @@
+= render 'layout' do
+  = render 'effective/classified_wizards/content', resource: resource
+
+  - raise('expected a submitted classified_wizard') unless resource.was_submitted?
+
+  .alert.alert-warning.mb-4
+    Successfully submitted on #{resource.submitted_at.strftime('%F')}.
+
+  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
+
+  = render 'effective/classified_wizards/summary', classified_wizard: resource
+  = render 'effective/classified_wizards/classified_wizard', classified_wizard: resource
+
+  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'

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

@@ -0,0 +1,8 @@
+= render 'layout' do
+  = render 'effective/classified_wizards/content', resource: resource
+
+  = render('effective/classified_wizards/classified_wizard', classified_wizard: resource)
+
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :id
+    = 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_wizard_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.present?(self)
+    = 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

@@ -1,19 +1,19 @@
 EffectiveClassifieds.setup do |config|
   config.classifieds_table_name = :classifieds
-  config.classified_submissions_table_name = :classified_submissions
+  config.classified_wizards_table_name = :classified_wizards
 
   # 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
   # config.layout = { application: 'application', admin: 'admin' }
 
   # Classified Settings
-  # config.classified_submission_class_name = 'Effective::ClassifiedSubmission'
+  # config.classified_wizard_class_name = 'Effective::ClassifiedWizard'
 
   # 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/config/routes.rb

@@ -9,8 +9,8 @@ EffectiveClassifieds::Engine.routes.draw do
   scope module: 'effective' do
     resources :classifieds, only: [:index, :show, :edit, :update]
 
-    resources :classified_submissions, only: [:new, :show, :destroy] do
-      resources :build, controller: :classified_submissions, only: [:show, :update]
+    resources :classified_wizards, only: [:new, :show, :destroy] do
+      resources :build, controller: :classified_wizards, only: [:show, :update]
     end
 
   end

data/db/migrate/01_create_effective_classifieds.rb.erb

@@ -1,8 +1,8 @@
 class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
   def change
     create_table <%= @classifieds_table_name %> do |t|
-      t.integer :classified_submission_id
-      t.string :classified_submission_type
+      t.integer :classified_wizard_id
+      t.string :classified_wizard_type
 
       t.integer :owner_id
       t.string :owner_type
@@ -36,7 +36,7 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
     add_index :classifieds, [:owner_id, :owner_type]
     add_index :classifieds, :slug
 
-    create_table <%= @classified_submissions_table_name %> do |t|
+    create_table <%= @classified_wizards_table_name %> do |t|
       t.string :token
 
       t.integer :owner_id
@@ -56,7 +56,7 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.datetime :created_at
     end
 
-    add_index :classified_submissions, [:owner_id, :owner_type]
-    add_index :classified_submissions, :token
+    add_index :classified_wizards, [:owner_id, :owner_type]
+    add_index :classified_wizards, :token
   end
 end

data/lib/effective_classifieds/engine.rb

@@ -10,7 +10,7 @@ module EffectiveClassifieds
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_classifieds.active_record' do |app|
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(EffectiveClassifiedsClassifiedSubmission::Base)
+        ActiveRecord::Base.extend(EffectiveClassifiedsClassifiedWizard::Base)
       end
     end
 

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/effective_classifieds.rb

@@ -7,17 +7,17 @@ module EffectiveClassifieds
 
   def self.config_keys
     [
-      :classifieds_table_name, :classified_submissions_table_name,
+      :classifieds_table_name, :classified_wizards_table_name,
       :layout, :categories, :per_page, :use_effective_roles, :max_duration, :auto_approve,
-      :classified_submission_class_name,
+      :classified_wizard_class_name,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin
     ]
   end
 
   include EffectiveGem
 
-  def self.ClassifiedSubmission
-    classified_submission_class_name&.constantize || Effective::ClassifiedSubmission
+  def self.ClassifiedWizard
+    classified_wizard_class_name&.constantize || Effective::ClassifiedWizard
   end
 
   def self.mailer_class

data/lib/generators/effective_classifieds/install_generator.rb

@@ -21,7 +21,7 @@ module EffectiveMemberships
 
       def create_migration_file
         @classifieds_table_name  = ':' + EffectiveClassifieds.classifieds_table_name.to_s
-        @classified_submissions_table_name  = ':' + EffectiveClassifieds.classified_submissions_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'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,38 +179,37 @@ files:
 - app/assets/javascripts/effective_classifieds/base.js
 - app/assets/stylesheets/effective_classifieds.scss
 - app/assets/stylesheets/effective_classifieds/base.scss
-- app/controllers/admin/classified_submissions_controller.rb
+- app/controllers/admin/classified_wizards_controller.rb
 - app/controllers/admin/classifieds_controller.rb
-- app/controllers/effective/classified_submissions_controller.rb
+- app/controllers/effective/classified_wizards_controller.rb
 - app/controllers/effective/classifieds_controller.rb
-- app/datatables/admin/effective_classified_submissions_datatable.rb
+- app/datatables/admin/effective_classified_wizards_datatable.rb
 - app/datatables/admin/effective_classifieds_datatable.rb
-- app/datatables/effective_classified_submissions_datatable.rb
+- app/datatables/effective_classified_wizards_datatable.rb
 - app/datatables/effective_classifieds_datatable.rb
 - app/helpers/effective_classifieds_helper.rb
 - app/mailers/effective/classifieds_mailer.rb
-- app/models/concerns/effective_classifieds_classified_submission.rb
+- app/models/concerns/effective_classifieds_classified_wizard.rb
 - app/models/effective/classified.rb
-- app/models/effective/classified_submission.rb
+- app/models/effective/classified_wizard.rb
 - app/views/admin/classifieds/_form.html.haml
 - app/views/admin/classifieds/_form_access.html.haml
 - app/views/admin/classifieds/_form_classified.html.haml
-- app/views/effective/classified_submissions/_classified.haml
-- app/views/effective/classified_submissions/_classified_submission.html.haml
-- app/views/effective/classified_submissions/_content.html.haml
-- app/views/effective/classified_submissions/_dashboard.html.haml
-- app/views/effective/classified_submissions/_layout.html.haml
-- app/views/effective/classified_submissions/_summary.html.haml
-- app/views/effective/classified_submissions/classified.html.haml
-- app/views/effective/classified_submissions/start.html.haml
-- app/views/effective/classified_submissions/submitted.html.haml
-- app/views/effective/classified_submissions/summary.html.haml
+- app/views/effective/classified_wizards/_classified.html.haml
+- app/views/effective/classified_wizards/_classified_wizard.html.haml
+- app/views/effective/classified_wizards/_content.html.haml
+- app/views/effective/classified_wizards/_dashboard.html.haml
+- app/views/effective/classified_wizards/_layout.html.haml
+- app/views/effective/classified_wizards/_summary.html.haml
+- app/views/effective/classified_wizards/classified.html.haml
+- app/views/effective/classified_wizards/start.html.haml
+- app/views/effective/classified_wizards/submitted.html.haml
+- app/views/effective/classified_wizards/summary.html.haml
 - app/views/effective/classifieds/_classified.html.haml
 - 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/controllers/admin/classified_submissions_controller.rb

@@ -1,19 +0,0 @@
-module Admin
-  class ClassifiedSubmissionsController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
-    before_action { EffectiveResources.authorize!(self, :admin, :effective_classifieds) }
-
-    include Effective::CrudController
-
-    resource_scope -> { EffectiveEvents.ClassifiedSubmission.deep.all }
-    datatable -> { Admin::EffectiveClassifiedSubmissionsDatatable.new }
-
-    private
-
-    def permitted_params
-      model = (params.key?(:effective_classified_submission) ? :effective_classified_submission : :classified_submission)
-      params.require(model).permit!
-    end
-
-  end
-end

data/app/controllers/effective/classified_submissions_controller.rb

@@ -1,31 +0,0 @@
-module Effective
-  class ClassifiedSubmissionsController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
-
-    include Effective::WizardController
-
-    resource_scope -> { EffectiveClassifieds.ClassifiedSubmission.deep.where(owner: current_user) }
-
-    # Allow only 1 in-progress application at a time
-    before_action(only: [:new, :show], unless: -> { resource&.done? }) do
-      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"
-        redirect_to effective_classifieds.classified_submission_build_path(existing, existing.next_step)
-      end
-    end
-
-    after_save do
-      flash.now[:success] = ''
-    end
-
-    private
-
-    def permitted_params
-      model = (params.key?(:effective_classified_submission) ? :effective_classified_submission : :classified_submission)
-      params.require(model).permit!.except(:status, :status_steps, :wizard_steps, :submitted_at)
-    end
-
-  end
-end

data/app/datatables/effective_classified_submissions_datatable.rb

@@ -1,37 +0,0 @@
-# Dashboard Classified Submissions
-class EffectiveClassifiedSubmissionsDatatable < Effective::Datatable
-  datatable do
-    order :created_at
-
-    col :token, visible: false
-    col :created_at, visible: false
-
-    col :submitted_at do |submission|
-      submission.submitted_at&.strftime('%F') || 'Incomplete'
-    end
-
-    col :classified, search: :string
-
-    col :owner, visible: false, search: :string
-
-    col :status do |submission|
-      submission.classified&.status || submission.status
-    end
-
-    actions_col(actions: []) do |submission|
-      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
-      end
-
-      dropdown_link_to('Delete', effective_classifieds.classified_submission_path(submission), 'data-confirm': "Really delete #{submission}?", 'data-method': :delete)
-    end
-  end
-
-  collection do
-    EffectiveClassifieds.ClassifiedSubmission.deep.where(owner: current_user).left_joins(:classified)
-  end
-
-end

data/app/models/effective/classified_submission.rb

@@ -1,7 +0,0 @@
-module Effective
-  class ClassifiedSubmission < ActiveRecord::Base
-    self.table_name = EffectiveClassifieds.classified_submissions_table_name.to_s
-
-    effective_classifieds_classified_submission
-  end
-end

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

@@ -1,12 +0,0 @@
-= 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?
-
-  - classified = classified_submission.classified
-
-  - if classified.present?
-    = render('effective/classifieds/classified', classified: classified) do
-      = classified.body

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

@@ -1,8 +0,0 @@
-.effective-classified-submission
-  - blacklist = EffectiveClassifieds.ClassifiedSubmission.required_wizard_steps
-  - steps = classified_submission.required_steps - blacklist
-
-  = render "effective/classified_submissions/summary", classified_submission: classified_submission
-
-  - steps.select { |step| classified_submission.has_completed_step?(step) }.each do |partial|
-    = render "effective/classified_submissions/#{partial}", classified_submission: classified_submission, step: partial

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

@@ -1,28 +0,0 @@
--# In progress submission
-- submission = EffectiveClassifieds.ClassifiedSubmission.in_progress.for(current_user).first
-- datatable = EffectiveResources.best('EffectiveClassifiedSubmissionsDatatable').new(self, namespace: :effective)
-
-- if submission.present?
-  %h2 In Progress Classified Submissions
-
-  %p
-    Your submission for #{submission.classified.presence || 'a classified'} is incomplete
-
-  %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.
-
-  %hr
-
-%h2 Classified Submissions
-
-- if datatable.present?
-  = render_simple_datatable(datatable)
-- else
-  %p You have no past classified submissions. When you do, we'll show them here.
-
-- if submission.blank?
-  %p= link_to 'Submit New Classified', effective_classifieds.new_classified_submission_path, class: 'btn btn-primary'

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

@@ -1,16 +0,0 @@
-= render 'layout' do
-  = render 'effective/classified_submissions/content', resource: resource
-
-  .card
-    .card-body
-      %p Welcome #{current_user}!
-
-      %p You are about to submit a classified
-
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
-
-        = f.hidden_field :owner_type
-        = f.hidden_field :owner_id
-
-        = f.save 'Save and Continue'

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

@@ -1,13 +0,0 @@
-= render 'layout' do
-  = render 'effective/classified_submissions/content', resource: resource
-
-  - raise('expected a submitted classified_submission') unless resource.was_submitted?
-
-  .alert.alert-warning.mb-4
-    Successfully submitted on #{resource.submitted_at.strftime('%F')}.
-
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
-
-  = render 'effective/classified_submissions/classified_submission', classified_submission: resource
-
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'

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

@@ -1,8 +0,0 @@
-= render 'layout' do
-  = render 'effective/classified_submissions/content', resource: resource
-
-  = render('effective/classified_submissions/classified_submission', classified_submission: resource)
-
-  = 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'

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

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

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

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